Skip to content
This repository was archived by the owner on Aug 17, 2025. It is now read-only.

chore: store project root in the builder #5366

Merged
stuartwdouglas merged 2 commits into from
May 6, 2025
Merged

chore: store project root in the builder #5366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6428798
chore: store project root in the builder
stuartwdouglas May 6, 2025
c18e1d7
tmp
stuartwdouglas May 6, 2025
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
2 changes: 1 addition & 1 deletion ...e/ftl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/EnumProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ private TypeEnum extractTypeEnum(CombinedIndexBuildItem index, ProjectRootBuildI
Thread.currentThread().getContextClassLoader());
variantClasses.add(variantClazz);
}
xyz.block.ftl.schema.v1.Type declType = moduleBuilder.buildType(projectRoot, variantType, visibility,
xyz.block.ftl.schema.v1.Type declType = moduleBuilder.buildType(variantType, visibility,
Nullability.NOT_NULL);
TypeValue typeValue = TypeValue.newBuilder().setValue(declType).build();

Expand Down
47 changes: 36 additions & 11 deletions ...e/ftl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/HTTPProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,20 +117,23 @@ public void accept(ModuleBuilder moduleBuilder) {
@Override
public void accept(ModuleBuilder moduleBuilder) {
Type stringType = Type.newBuilder().setString(xyz.block.ftl.schema.v1.String.newBuilder().build()).build();
Type pathParamType = Type.newBuilder()
.setMap(xyz.block.ftl.schema.v1.Map.newBuilder().setKey(stringType)
.setValue(stringType))
.build();

for (var endpoint : restEndpoints.getEntries()) {
var verbName = ModuleBuilder.methodToName(endpoint.getMethodInfo());

org.jboss.jandex.Type bodyParamType = VoidType.VOID;
MethodParameter[] parameters = endpoint.getResourceMethod().getParameters();

List<MethodParameter> pathParams = new ArrayList<>();
List<MethodParameter> queryParams = new ArrayList<>();
for (int i = 0, parametersLength = parameters.length; i < parametersLength; i++) {
var httpParam = parameters[i];
if (httpParam.parameterType.equals(ParameterType.BODY)) {
bodyParamType = endpoint.getMethodInfo().parameterType(i);
} else if (httpParam.parameterType.equals(ParameterType.PATH)) {
pathParams.add(httpParam);
} else if (httpParam.parameterType.equals(ParameterType.QUERY)) {
queryParams.add(httpParam);
}
}

Expand All @@ -147,6 +150,7 @@ public void accept(ModuleBuilder moduleBuilder) {
String path = extractPath(endpoint);
URITemplate template = new URITemplate(path, false);
List<IngressPathComponent> pathComponents = new ArrayList<>();
boolean hasParams = false;
for (var i : template.components) {
if (i.type == URITemplate.Type.CUSTOM_REGEX) {
throw new RuntimeException(
Expand All @@ -163,11 +167,37 @@ public void accept(ModuleBuilder moduleBuilder) {
.build());
}
} else {
hasParams = true;
pathComponents.add(IngressPathComponent.newBuilder()
.setIngressPathParameter(IngressPathParameter.newBuilder().setName(i.name))
.build());
}
}

Type pathParamType;
if (pathParams.isEmpty() && !hasParams) {
pathParamType = Type.newBuilder()
.setUnit(Unit.newBuilder())
.build();
} else {
pathParamType = Type.newBuilder()
.setMap(xyz.block.ftl.schema.v1.Map.newBuilder().setKey(stringType)
.setValue(stringType))
.build();
}

Type.Builder queryParamsType;
if (queryParams.isEmpty()) {
queryParamsType = Type.newBuilder()
.setUnit(Unit.newBuilder());
} else {
queryParamsType = Type.newBuilder()
.setMap(xyz.block.ftl.schema.v1.Map.newBuilder().setKey(stringType)
.setValue(Type.newBuilder()
.setArray(
Array.newBuilder().setElement(stringType))));
}

ModuleBuilder.VerbCustomization verbCustomization = new ModuleBuilder.VerbCustomization();
verbCustomization.setCustomHandling(true)
.setMetadataCallback((builder) -> {
Expand All @@ -193,12 +223,7 @@ public void accept(ModuleBuilder moduleBuilder) {
.setName(HttpRequest.class.getSimpleName())
.addTypeParameters(requestTypeParam)
.addTypeParameters(pathParamType)
.addTypeParameters(Type.newBuilder()
.setMap(xyz.block.ftl.schema.v1.Map.newBuilder().setKey(stringType)
.setValue(Type.newBuilder()
.setArray(
Array.newBuilder().setElement(stringType)))
.build())))
.addTypeParameters(queryParamsType))
.build();
})
.setResponseType((responseTypeParam) -> {
Expand All @@ -210,7 +235,7 @@ public void accept(ModuleBuilder moduleBuilder) {
.build();
});

moduleBuilder.registerVerbMethod(projectRoot, endpoint.getMethodInfo(),
moduleBuilder.registerVerbMethod(endpoint.getMethodInfo(),
endpoint.getActualClassInfo().name().toString(),
Visibility.VISIBILITY_SCOPE_NONE, false, ModuleBuilder.BodyType.ALLOWED, verbCustomization);
}
Expand Down
Loading
Loading