Skip to content

Commit

Permalink
[KOGITO-9584] Support id
Browse files Browse the repository at this point in the history
  • Loading branch information
@fjtirado
fjtirado committed Jul 19, 2023
1 parent abb3674 commit bfcfefc
Show file tree
Hide file tree
Showing 6 changed files with 116 additions and 30 deletions.
8 changes: 5 additions & 3 deletions ...ilder/src/main/java/org/kie/kogito/serverless/workflow/utils/ServerlessWorkflowUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.kie.kogito.serverless.workflow.extensions.OutputSchema;
import org.kie.kogito.serverless.workflow.extensions.URIDefinitions;
import org.kie.kogito.serverless.workflow.io.URIContentLoaderFactory;
import org.kie.kogito.serverless.workflow.io.URIContentLoaderFactory.Builder;
import org.kie.kogito.serverless.workflow.models.JsonNodeModel;
import org.kie.kogito.serverless.workflow.parser.ParserContext;
import org.kie.kogito.serverless.workflow.suppliers.ConfigWorkItemSupplier;
Expand Down Expand Up @@ -195,9 +196,10 @@ public static Optional<byte[]> loadResourceFile(Workflow workflow, Optional<Pars
public static Optional<byte[]> loadResourceFile(String uriStr, Optional<Workflow> workflow, Optional<ParserContext> parserContext, String authRef) {
final URI uri = URI.create(uriStr);
try {
final byte[] bytes =
URIContentLoaderFactory.readAllBytes(URIContentLoaderFactory.loader(uri, parserContext.map(p -> p.getContext().getClassLoader()), Optional.empty(), workflow, authRef));
return Optional.of(bytes);
Builder builder = URIContentLoaderFactory.builder(uri).withAuthRef(authRef);
workflow.ifPresent(builder::withWorkflow);
parserContext.map(p -> p.getContext().getClassLoader()).ifPresent(builder::withClassloader);
return Optional.of(URIContentLoaderFactory.readAllBytes(builder.build()));
} catch (UncheckedIOException io) {
// if file cannot be found in build context, warn it and return the unmodified uri (it might be possible that later the resource is available at runtime)
logger.warn("Resource {} cannot be found at build time, ignoring", uri, io);
Expand Down
92 changes: 82 additions & 10 deletions ...-runtime/src/main/java/org/kie/kogito/serverless/workflow/io/URIContentLoaderFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,95 @@ public static byte[] readAllBytes(URIContentLoader loader) {

public static URIContentLoader runtimeLoader(String uriStr) {
URI uri = URI.create(uriStr);
return loader(uri, Optional.empty(), Optional.of(new ClassPathContentLoader(uri, Optional.empty())), Optional.empty(), null);
Builder builder = new Builder(uri);
builder.withFallback(new ClassPathContentLoader(uri, Optional.empty()));
return builder.build();

}

public static URIContentLoader buildLoader(URI uri, ClassLoader cl, Workflow workflow, String authRef) {
return loader(uri, Optional.of(cl), Optional.empty(), Optional.of(workflow), authRef);
return new Builder(uri).withClassloader(cl).withWorkflow(workflow).withAuthRef(authRef).build();
}

/**
* @deprecated Use builder
*/
@Deprecated
public static URIContentLoader loader(URI uri, Optional<ClassLoader> cl, Optional<URIContentLoader> fallback, Optional<Workflow> workflow, String authRef) {
switch (URIContentLoaderType.from(uri)) {
case FILE:
return new FileContentLoader(uri, fallback);
case HTTP:
return new HttpContentLoader(uri, fallback, workflow, authRef);
default:
case CLASSPATH:
return new ClassPathContentLoader(uri, cl);
Builder builder = new Builder(uri);
cl.ifPresent(builder::withClassloader);
fallback.ifPresent(builder::withFallback);
workflow.ifPresent(builder::withWorkflow);
builder.withAuthRef(authRef);
return builder.build();
}

public static Builder builder(URI uri) {
return new Builder(uri);
}

public static class Builder {
private URI uri;
private ClassLoader cl;
private URIContentLoader fallback;
private Workflow workflow;
private String authRef;
private URI baseURI;

private Builder(URI uri) {
this.uri = uri;
}

public Builder withClassloader(ClassLoader cl) {
this.cl = cl;
return this;
}

public Builder withFallback(URIContentLoader fallback) {
this.fallback = fallback;
return this;
}

public Builder withWorkflow(Workflow workflow) {
this.workflow = workflow;
return this;
}

public Builder withAuthRef(String authRef) {
this.authRef = authRef;
return this;
}

public Builder withBaseURI(String baseURI) {
if (baseURI != null) {
int lastIndexOf = baseURI.lastIndexOf('/');
this.baseURI = URI.create(lastIndexOf != -1 ? baseURI.substring(0, lastIndexOf) : baseURI);
}
return this;
}

public URIContentLoader build() {
if (uri.getScheme() == null) {
if (baseURI != null) {
uri = compoundURI(baseURI, uri);
} else {
return new ClassPathContentLoader(uri, Optional.ofNullable(cl));
}
}
switch (URIContentLoaderType.from(uri)) {
case FILE:
return new FileContentLoader(uri, Optional.ofNullable(fallback));
case HTTP:
return new HttpContentLoader(uri, Optional.ofNullable(fallback), Optional.ofNullable(workflow), authRef);
default:
case CLASSPATH:
return new ClassPathContentLoader(uri, Optional.ofNullable(cl));
}
}
}

private static URI compoundURI(URI baseURI, URI uri) {
return URI.create(baseURI.toString() + "/" + uri.toString());
}

private URIContentLoaderFactory() {
Expand Down
3 changes: 0 additions & 3 deletions ...low-runtime/src/main/java/org/kie/kogito/serverless/workflow/io/URIContentLoaderType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ public enum URIContentLoaderType {
HTTP;

public static URIContentLoaderType from(URI uri) {
if (uri.getScheme() == null) {
return CLASSPATH;
}
switch (uri.getScheme().toLowerCase()) {
case "file":
return FILE;
Expand Down
9 changes: 6 additions & 3 deletions ...oyment/src/main/java/org/kie/kogito/serverless/workflow/parser/schema/JsonSchemaImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import java.net.URISyntaxException;
import java.util.List;
import java.util.Map;
import java.util.Optional;

import org.eclipse.microprofile.openapi.models.media.Schema;
import org.kie.kogito.jackson.utils.ObjectMapperFactory;
Expand All @@ -48,11 +47,16 @@ public class JsonSchemaImpl extends SchemaImpl {

private static final Logger logger = LoggerFactory.getLogger(JsonSchemaImpl.class);

@JsonSetter("$id")
public void setId(String id) {
RefSchemas.baseURI(id);
}

@JsonSetter("$ref")
@Override
public void setRef(String ref) {
if (ref != null && !ref.startsWith("#")) {
try (InputStream is = URIContentLoaderFactory.loader(new URI(ref), Optional.empty(), Optional.empty(), Optional.empty(), null).getInputStream()) {
try (InputStream is = URIContentLoaderFactory.builder(new URI(ref)).withBaseURI(RefSchemas.getBaseURI()).build().getInputStream()) {
JsonSchemaImpl schema = ObjectMapperFactory.get().readValue(is.readAllBytes(), JsonSchemaImpl.class);
String key;
if (schema.getTitle() == null) {
Expand Down Expand Up @@ -114,5 +118,4 @@ public Schema getAdditionalPropertiesSchema() {
public Schema getNot() {
return super.getNot();
}

}
25 changes: 14 additions & 11 deletions ...in/java/org/kie/kogito/serverless/workflow/parser/schema/OpenApiModelSchemaGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,21 @@ private OpenApiModelSchemaGenerator() {

public static void addOpenAPIModelSchema(KogitoWorkflowProcess workflow, Map<String, Schema> schemas) {
if (workflow instanceof WorkflowProcess) {
RefSchemas.init(workflow.getId());
WorkflowProcess workflowProcess = (WorkflowProcess) workflow;
getSchema(workflowProcess.getInputValidator()).ifPresent(v -> {
String key = getSchemaName(workflow.getId(), INPUT_SUFFIX);
schemas.put(key, schemaTitle(key, v));
});
getSchema(workflowProcess.getOutputValidator()).ifPresent(v -> {
String key = getSchemaName(workflow.getId(), OUTPUT_SUFFIX);
schemas.put(key, createOutputSchema(schemaTitle(key, v)));
});
schemas.putAll(RefSchemas.get());
RefSchemas.reset();
RefSchemas.init(workflow.getId());
try {
getSchema(workflowProcess.getInputValidator()).ifPresent(v -> {
String key = getSchemaName(workflow.getId(), INPUT_SUFFIX);
schemas.put(key, schemaTitle(key, v));
});
getSchema(workflowProcess.getOutputValidator()).ifPresent(v -> {
String key = getSchemaName(workflow.getId(), OUTPUT_SUFFIX);
schemas.put(key, createOutputSchema(schemaTitle(key, v)));
});
schemas.putAll(RefSchemas.get());
} finally {
RefSchemas.reset();
}
}
}

Expand Down
9 changes: 9 additions & 0 deletions ...deployment/src/main/java/org/kie/kogito/serverless/workflow/parser/schema/RefSchemas.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ private static class ThreadInfo {
private final String id;
private final Map<String, Schema> map = new HashMap<>();
private int counter;
private String baseURI;

private ThreadInfo(String id) {
this.id = id;
Expand All @@ -46,6 +47,14 @@ public static Map<String, Schema> get() {
return threadInfo.get().map;
}

public static void baseURI(String baseURI) {
threadInfo.get().baseURI = baseURI;
}

public static String getBaseURI() {
return threadInfo.get().baseURI;
}

public static String getKey() {
ThreadInfo t = threadInfo.get();
return t.id + "_nested_" + ++t.counter;
Expand Down

0 comments on commit bfcfefc

Please sign in to comment.