Skip to content

Commit 5fa7722

Browse files
committed
fix: adds input as a valid service.method output
1 parent 7b42872 commit 5fa7722

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/io/zenwave360/zdl/antlr/ZdlModelValidator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ private List<Map> validateServices(ZdlModel model) {
162162
model.addProblem(path("services", service.getKey(), "methods", methodName, "parameter"), parameter, "%s is not an entity or input");
163163
}
164164
var returnType = (String) JSONPath.get(method, "$.returnType");
165-
if(returnType != null && !isEntity(model, returnType) && !isOutput(model, returnType)) {
166-
model.addProblem(path("services", service.getKey(), "methods", methodName, "returnType"), returnType, "%s is not an entity or output");
165+
if(returnType != null && !isEntity(model, returnType) && !isInput(model, returnType) && !isOutput(model, returnType)) {
166+
model.addProblem(path("services", service.getKey(), "methods", methodName, "returnType"), returnType, "%s is not an entity, input or output");
167167
}
168168
List<Object> withEvents = (List) method.getOrDefault("withEvents", List.of());
169169
for (int i = 0; i < withEvents.size(); i++) {

src/test/java/io/zenwave360/zdl/antlr/ZdlListenerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public void parseZdl_Problems() throws Exception {
197197

198198
ZdlModel model = parseZdl("src/test/resources/problems.zdl");
199199
var problems = get(model, "$.problems", List.of());
200-
assertEquals(15, problems.size());
200+
assertEquals(14, problems.size());
201201
// System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(model));
202202
}
203203

@@ -206,7 +206,7 @@ public void parseZdl_Problems_ExtraTypes() throws Exception {
206206

207207
ZdlModel model = parseZdl("src/test/resources/problems.zdl", List.of("OrderStatusX"));
208208
var problems = get(model, "$.problems", List.of());
209-
assertEquals(13, problems.size());
209+
assertEquals(12, problems.size());
210210
// System.out.println(mapper.writerWithDefaultPrettyPrinter().writeValueAsString(model));
211211
}
212212

0 commit comments

Comments
 (0)