Skip to content

Restore model validation not to fail on diagnostic errors for rules and scripts #5351

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

Merged
kaikreuzer merged 6 commits into from
Feb 14, 2026
Merged

Restore model validation not to fail on diagnostic errors for rules and scripts #5351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11e54be
Restore model validation not to fail on diagnostic errors
jimtng Feb 13, 2026
1858309
improve log visibility of validation issues
jimtng Feb 13, 2026
636b7c4
exclude rules and scripts from model validation
jimtng Feb 14, 2026
a078759
revert warn level
jimtng Feb 14, 2026
d4355ff
use fileExtension
jimtng Feb 14, 2026
7eff270
ignore case
jimtng Feb 14, 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
4 changes: 3 additions & 1 deletion ...re.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,10 +331,12 @@ private boolean validateModel(String name, InputStream inputStream, List<String>

// Check for validation errors, but log them only
try {
String modelType = resource.getURI().fileExtension();
final org.eclipse.emf.common.util.Diagnostic diagnostic = safeEmf
.call(() -> Diagnostician.INSTANCE.validate(resource.getContents().getFirst()));
for (org.eclipse.emf.common.util.Diagnostic d : diagnostic.getChildren()) {
if (d.getSeverity() == org.eclipse.emf.common.util.Diagnostic.ERROR) {
if (d.getSeverity() == org.eclipse.emf.common.util.Diagnostic.ERROR
&& !"rules".equalsIgnoreCase(modelType) && !"script".equalsIgnoreCase(modelType)) {
errors.add(d.getMessage());
} else {
warnings.add(d.getMessage());
Expand Down
22 changes: 22 additions & 0 deletions ...del.rule.tests/src/main/java/org/openhab/core/model/rule/runtime/DSLRuleProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,4 +268,26 @@ public void testVars() {
Object x = context.getValue(QualifiedName.create("x"));
assertThat(x, is(15));
}

@Test
public void testRuleWithUntypedLambdaArgsDoesNotFailToLoad() {
Collection<Rule> rules = dslRuleProvider.getAll();
assertThat(rules.size(), is(0));

String model = """
var lambdaWithUntypedArgs = [ foo | foo ]
rule "RuleWithUntypedLambdaArgs"
when
System started
then
logInfo('Test', 'Test')
end
""";

modelRepository.addOrRefreshModel(TESTMODEL_NAME,
new ByteArrayInputStream(model.getBytes(StandardCharsets.UTF_8)));
Collection<Rule> actualRules = dslRuleProvider.getAll();

assertThat(actualRules.size(), is(1));
}
}