pefernan commented on code in PR #7204:
URL: https://github.com/apache/incubator-kie/pull/7204#discussion_r4338492240
##########
kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessResourceGenerator.java:
##########
@@ -335,50 +342,108 @@ protected void
generateSignalsEndpoints(TemplatedGenerator.Builder templateBuild
setterMethod.setName(setterMethod.getNameAsString().replace("$SetModelMethodName$",
StringUtils.ucFirst(name)));
}
- template.addMethod(SIGNAL_METHOD_PREFFIX +
signalName, Keyword.PUBLIC)
+ MethodDeclaration processMethod = template
+ .addMethod(SIGNAL_METHOD_PREFFIX +
signalName, Keyword.PUBLIC)
.setType(signalProcessDeclarationClone.getType())
.setParameters(signalProcessDeclarationClone.getParameters())
.setBody(signalProcessBody)
.setAnnotations(signalProcessDeclarationClone.getAnnotations());
+ if (signalType != null) {
+
processMethod.findAll(ClassOrInterfaceType.class)
+ .forEach(t ->
t.setName(t.getNameAsString().replace("$signalType$", signalType)));
+ }
+
processMethod.findAll(StringLiteralExpr.class).forEach(vv -> {
+ String interpolated = vv.getValue()
+ .replace("$signalName$",
signalName)
+ .replace("$signalPath$",
sanitizeName(signalName));
+ vv.setString(interpolated);
+ });
});
// Create endpoint to signal process instances
- MethodDeclaration
signalInstanceDeclarationClone = signalInstanceDeclaration.clone();
- BlockStmt signalInstanceBody =
signalInstanceDeclarationClone.getBody()
- .orElseThrow(() -> new
RuntimeException("signalInstanceDeclaration doesn't have body"));
-
- if (signalType == null) {
- signalInstanceBody.findAll(NameExpr.class,
nameExpr -> "data".equals(nameExpr.getNameAsString())).forEach(name ->
name.replace(new NullLiteralExpr()));
- }
-
- template.addMethod(SIGNAL_METHOD_PREFFIX +
index.getAndIncrement(), Keyword.PUBLIC)
-
.setType(signalInstanceDeclarationClone.getType())
- // Remove data parameter ( payload )
if signalType is null
- .setParameters(signalType == null ?
NodeList.nodeList(signalInstanceDeclarationClone.getParameter(0)) :
signalInstanceDeclaration.getParameters())
- .setBody(signalInstanceBody)
-
.setAnnotations(signalInstanceDeclarationClone.getAnnotations());
-
- if (signalType != null) {
-
template.findAll(ClassOrInterfaceType.class).forEach(name -> {
- String identifier =
name.getNameAsString();
-
name.setName(identifier.replace("$signalType$", signalType));
- });
- }
-
-
template.findAll(StringLiteralExpr.class).forEach(vv -> {
- String s = vv.getValue();
- String interpolated =
s.replace("$signalName$", signalName);
- interpolated =
interpolated.replace("$signalPath$", sanitizeName(signalName));
- vv.setString(interpolated);
- });
+ addSignalInstanceEndpoint(
+ template,
+ signalInstanceDeclaration,
+ SIGNAL_METHOD_PREFFIX +
index.getAndIncrement(),
+ signalName,
+ signalType,
+ sanitizeName(signalName),
+ false);
});
+ if (hasDynamicSignals) {
+ addSignalInstanceEndpoint(
Review Comment:
I think it would be better if we add a specific `dynamicSignalInstance`
route in the main template (for quarkus and spring) that we can copy and add to
the resource `template` this way we don't have to do any extra processing in
the `addSignalInstanceEndpoint` ([line
422](https://github.com/apache/incubator-kie/pull/7204/changes#diff-51bf67d0f9bd0e476c3c17809373974eb0824e72f2cd5c2534f8bf48211068c3R422))
if it is dynamic. Something like:
- **Quarkus** - `RestResourceSignalQuarkusTemplate.java:`
```java
@POST
@Path("/{id}/signal/{signalName}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public $Type$Output dynamicSignalInstance(@PathParam("id") final String id,
@PathParam("signalName") final
String signalName,
final JsonNode data) {
return processService.signalProcessInstance(process, id, data,
signalName)
.orElseThrow(() -> new ClientErrorException(
String.format("Process instance %s is not currently
accepting signal '%s'", id, signalName),
Response.Status.PRECONDITION_FAILED));
}
```
- **Spring** - `RestResourceSignalSpringTemplate.java`:
```java
@PostMapping(value = "/{id}/signal/{signalName}",
produces = MediaType.APPLICATION_JSON_VALUE,
consumes = MediaType.APPLICATION_JSON_VALUE)
public $Type$Output dynamicSignalInstance(@PathVariable("id") final String
id,
@PathVariable("signalName") final
String signalName,
final @RequestBody(required =
false) JsonNode data) {
return processService.signalProcessInstance(process, id, data,
signalName)
.orElseThrow(() -> new
ResponseStatusException(HttpStatus.PRECONDITION_FAILED,
String.format("Process instance %s is not currently
accepting signal '%s'", id, signalName)));
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
