Skip to content

Commit

Permalink
fix: use typemap in JVM
Browse files Browse the repository at this point in the history 
fixes: #2513
fixes: #2510
  • Loading branch information
@stuartwdouglas
stuartwdouglas committed Aug 29, 2024
1 parent 9de38e9 commit 4eb66a1
Show file tree
Hide file tree
Showing 27 changed files with 629 additions and 64 deletions.
2 changes: 2 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ require (
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
github.com/sqlc-dev/pqtype v0.3.0
github.com/swaggest/jsonschema-go v0.3.72
github.com/tbd54566975/web5-go v0.24.0
github.com/tink-crypto/tink-go-awskms v0.0.0-20230616072154-ba4f9f22c3e9
github.com/tink-crypto/tink-go/v2 v2.2.0
github.com/titanous/json5 v1.0.0
Expand Down Expand Up @@ -85,6 +86,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
Expand Down
8 changes: 8 additions & 0 deletions go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions ...ime/ftl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/FTLDotNames.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import xyz.block.ftl.LeaseClient;
import xyz.block.ftl.Secret;
import xyz.block.ftl.Subscription;
import xyz.block.ftl.TypeAlias;
import xyz.block.ftl.TypeAliasMapper;
import xyz.block.ftl.Verb;

public class FTLDotNames {
Expand All @@ -21,6 +23,8 @@ private FTLDotNames() {
public static final DotName EXPORT = DotName.createSimple(Export.class);
public static final DotName VERB = DotName.createSimple(Verb.class);
public static final DotName CRON = DotName.createSimple(Cron.class);
public static final DotName TYPE_ALIAS_MAPPER = DotName.createSimple(TypeAliasMapper.class);
public static final DotName TYPE_ALIAS = DotName.createSimple(TypeAlias.class);
public static final DotName SUBSCRIPTION = DotName.createSimple(Subscription.class);
public static final DotName LEASE_CLIENT = DotName.createSimple(LeaseClient.class);
}
46 changes: 37 additions & 9 deletions ...tl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/JVMCodeGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Stream;

import org.eclipse.microprofile.config.Config;
Expand All @@ -24,6 +25,7 @@
public abstract class JVMCodeGenerator implements CodeGenProvider {

public static final String PACKAGE_PREFIX = "ftl.";
public static final String TYPE_MAPPER = "TypeAliasMapper";

@Override
public String providerId() {
Expand All @@ -42,6 +44,7 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
}
List<Module> modules = new ArrayList<>();
Map<DeclRef, Type> typeAliasMap = new HashMap<>();
Map<DeclRef, String> nativeTypeAliasMap = new HashMap<>();
try (Stream<Path> pathStream = Files.list(context.inputDir())) {
for (var file : pathStream.toList()) {
String fileName = file.getFileName().toString();
Expand All @@ -50,9 +53,30 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
}
var module = Module.parseFrom(Files.readAllBytes(file));
for (var decl : module.getDeclsList()) {
String packageName = PACKAGE_PREFIX + module.getName();
if (decl.hasTypeAlias()) {
var data = decl.getTypeAlias();
typeAliasMap.put(new DeclRef(module.getName(), data.getName()), data.getType());
boolean handled = false;
for (var md : data.getMetadataList()) {
if (md.hasTypeMap()) {
String runtime = md.getTypeMap().getRuntime();
if (runtime.equals("kotlin") || runtime.equals("java")) {
nativeTypeAliasMap.put(new DeclRef(module.getName(), data.getName()),
md.getTypeMap().getNativeName());
generateTypeAliasMapper(module.getName(), data.getName(), packageName,
Optional.of(md.getTypeMap().getNativeName()),
context.outDir());
handled = true;
break;
}
}
}
if (!handled) {
generateTypeAliasMapper(module.getName(), data.getName(), packageName, Optional.empty(),
context.outDir());
typeAliasMap.put(new DeclRef(module.getName(), data.getName()), data.getType());
}

}
}
modules.add(module);
Expand All @@ -69,26 +93,27 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
if (!verb.getExport()) {
continue;
}
generateVerb(module, verb, packageName, typeAliasMap, context.outDir());
generateVerb(module, verb, packageName, typeAliasMap, nativeTypeAliasMap, context.outDir());
} else if (decl.hasData()) {
var data = decl.getData();
if (!data.getExport()) {
continue;
}
generateDataObject(module, data, packageName, typeAliasMap, context.outDir());
generateDataObject(module, data, packageName, typeAliasMap, nativeTypeAliasMap, context.outDir());

} else if (decl.hasEnum()) {
var data = decl.getEnum();
if (!data.getExport()) {
continue;
}
generateEnum(module, data, packageName, typeAliasMap, context.outDir());
generateEnum(module, data, packageName, typeAliasMap, nativeTypeAliasMap, context.outDir());
} else if (decl.hasTopic()) {
var data = decl.getTopic();
if (!data.getExport()) {
continue;
}
generateTopicSubscription(module, data, packageName, typeAliasMap, context.outDir());
generateTopicSubscription(module, data, packageName, typeAliasMap, nativeTypeAliasMap,
context.outDir());
}
}
}
Expand All @@ -99,17 +124,20 @@ public boolean trigger(CodeGenContext context) throws CodeGenException {
return true;
}

protected abstract void generateTypeAliasMapper(String module, String name, String packageName,
Optional<String> nativeTypeAlias, Path outputDir) throws IOException;

protected abstract void generateTopicSubscription(Module module, Topic data, String packageName,
Map<DeclRef, Type> typeAliasMap, Path outputDir) throws IOException;
Map<DeclRef, Type> typeAliasMap, Map<DeclRef, String> nativeTypeAliasMap, Path outputDir) throws IOException;

protected abstract void generateEnum(Module module, Enum data, String packageName, Map<DeclRef, Type> typeAliasMap,
Path outputDir) throws IOException;
Map<DeclRef, String> nativeTypeAliasMap, Path outputDir) throws IOException;

protected abstract void generateDataObject(Module module, Data data, String packageName, Map<DeclRef, Type> typeAliasMap,
Path outputDir) throws IOException;
Map<DeclRef, String> nativeTypeAliasMap, Path outputDir) throws IOException;

protected abstract void generateVerb(Module module, Verb verb, String packageName, Map<DeclRef, Type> typeAliasMap,
Path outputDir) throws IOException;
Map<DeclRef, String> nativeTypeAliasMap, Path outputDir) throws IOException;

@Override
public boolean shouldRun(Path sourceDir, Config config) {
Expand Down
18 changes: 13 additions & 5 deletions ...e/ftl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/ModuleBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,13 @@
import xyz.block.ftl.v1.schema.Metadata;
import xyz.block.ftl.v1.schema.MetadataAlias;
import xyz.block.ftl.v1.schema.MetadataCalls;
import xyz.block.ftl.v1.schema.MetadataTypeMap;
import xyz.block.ftl.v1.schema.Module;
import xyz.block.ftl.v1.schema.Optional;
import xyz.block.ftl.v1.schema.Ref;
import xyz.block.ftl.v1.schema.Time;
import xyz.block.ftl.v1.schema.Type;
import xyz.block.ftl.v1.schema.TypeAlias;
import xyz.block.ftl.v1.schema.Unit;
import xyz.block.ftl.v1.schema.Verb;

Expand All @@ -75,7 +77,7 @@ public class ModuleBuilder {

private final IndexView index;
private final Module.Builder moduleBuilder;
private final Map<TypeKey, ExistingRef> dataElements = new HashMap<>();
private final Map<TypeKey, ExistingRef> dataElements;
private final String moduleName;
private final Set<String> knownSecrets = new HashSet<>();
private final Set<String> knownConfig = new HashSet<>();
Expand All @@ -86,7 +88,7 @@ public class ModuleBuilder {

public ModuleBuilder(IndexView index, String moduleName, Map<DotName, TopicsBuildItem.DiscoveredTopic> knownTopics,
Map<DotName, VerbClientBuildItem.DiscoveredClients> verbClients, FTLRecorder recorder,
Map<String, String> verbDocs) {
Map<String, String> verbDocs, Map<TypeKey, ExistingRef> typeAliases) {
this.index = index;
this.moduleName = moduleName;
this.moduleBuilder = Module.newBuilder()
Expand All @@ -96,6 +98,7 @@ public ModuleBuilder(IndexView index, String moduleName, Map<DotName, TopicsBuil
this.verbClients = verbClients;
this.recorder = recorder;
this.verbDocs = verbDocs;
this.dataElements = new HashMap<>(typeAliases);
}

public static @NotNull String methodToName(MethodInfo method) {
Expand Down Expand Up @@ -435,11 +438,16 @@ public void writeTo(OutputStream out) throws IOException {
moduleBuilder.build().writeTo(out);
}

record ExistingRef(Ref ref, boolean exported) {

public void registerTypeAlias(String name, org.jboss.jandex.Type finalT, org.jboss.jandex.Type finalS, boolean exported) {
moduleBuilder.addDecls(Decl.newBuilder()
.setTypeAlias(TypeAlias.newBuilder().setType(buildType(finalS, exported)).setName(name).addMetadata(Metadata
.newBuilder()
.setTypeMap(MetadataTypeMap.newBuilder().setRuntime("java").setNativeName(finalT.toString()).build())
.build()))
.build());
}

private record TypeKey(String name, List<String> typeParams) {
record ExistingRef(Ref ref, boolean exported) {

}

Expand Down
21 changes: 20 additions & 1 deletion ...ftl-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/ModuleProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.util.stream.Collectors;

import org.jboss.jandex.DotName;
import org.jboss.jandex.ParameterizedType;
import org.jboss.logging.Logger;
import org.tomlj.Toml;
import org.tomlj.TomlParseResult;
Expand Down Expand Up @@ -42,6 +43,7 @@
import xyz.block.ftl.runtime.VerbRegistry;
import xyz.block.ftl.runtime.config.FTLConfigSourceFactoryBuilder;
import xyz.block.ftl.runtime.http.FTLHttpHandler;
import xyz.block.ftl.v1.schema.Ref;

public class ModuleProcessor {

Expand Down Expand Up @@ -108,6 +110,7 @@ public void generateSchema(CombinedIndexBuildItem index,
ModuleNameBuildItem moduleNameBuildItem,
TopicsBuildItem topicsBuildItem,
VerbClientBuildItem verbClientBuildItem,
List<TypeAliasBuildItem> typeAliasBuildItems,
List<SchemaContributorBuildItem> schemaContributorBuildItems) throws Exception {
String moduleName = moduleNameBuildItem.getModuleName();
Map<String, String> verbDocs = new HashMap<>();
Expand All @@ -125,9 +128,25 @@ public void generateSchema(CombinedIndexBuildItem index,
}
}
}
Map<TypeKey, ModuleBuilder.ExistingRef> existingRefs = new HashMap<>();
for (var i : typeAliasBuildItems) {
String mn;
if (i.getModule().isEmpty()) {
mn = moduleNameBuildItem.getModuleName();
} else {
mn = i.getModule();
}
if (i.getLocalType() instanceof ParameterizedType) {
//TODO: we can't handle this yet
// existingRefs.put(new TypeKey(i.getLocalType().name().toString(), i.getLocalType().asParameterizedType().arguments().stream().map(i.)), new ModuleBuilder.ExistingRef(Ref.newBuilder().setModule(moduleName).setName(i.getName()).build(), i.isExported()));
} else {
existingRefs.put(new TypeKey(i.getLocalType().name().toString(), List.of()), new ModuleBuilder.ExistingRef(
Ref.newBuilder().setModule(mn).setName(i.getName()).build(), i.isExported()));
}
}

ModuleBuilder moduleBuilder = new ModuleBuilder(index.getComputingIndex(), moduleName, topicsBuildItem.getTopics(),
verbClientBuildItem.getVerbClients(), recorder, verbDocs);
verbClientBuildItem.getVerbClients(), recorder, verbDocs, existingRefs);

for (var i : schemaContributorBuildItems) {
i.getSchemaContributor().accept(moduleBuilder);
Expand Down
42 changes: 42 additions & 0 deletions ...-runtime/common/deployment/src/main/java/xyz/block/ftl/deployment/TypeAliasBuildItem.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package xyz.block.ftl.deployment;

import org.jboss.jandex.Type;

import io.quarkus.builder.item.MultiBuildItem;

public final class TypeAliasBuildItem extends MultiBuildItem {

final String name;
final String module;
final Type localType;
final Type serializedType;
final boolean exported;

public TypeAliasBuildItem(String name, String module, Type localType, Type serializedType, boolean exported) {
this.name = name;
this.module = module;
this.localType = localType;
this.serializedType = serializedType;
this.exported = exported;
}

public String getName() {
return name;
}

public String getModule() {
return module;
}

public Type getLocalType() {
return localType;
}

public Type getSerializedType() {
return serializedType;
}

public boolean isExported() {
return exported;
}
}
Loading

0 comments on commit 4eb66a1

Please sign in to comment.