Skip to content

Prisms 2.0 Module Validation #684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SentryMan merged 2 commits into from
Dec 2, 2025
Merged

Prisms 2.0 Module Validation #684

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
83cb2b6
Prisms 2.0 Module Validation
SentryMan Dec 1, 2025
75722e5
Update ClientProcessor.java
SentryMan Dec 1, 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
26 changes: 25 additions & 1 deletion http-generator-client/src/main/java/io/avaje/http/generator/client/ClientProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@
import static io.avaje.http.generator.core.ProcessingContext.platform;
import static io.avaje.http.generator.core.ProcessingContext.setPlatform;
import static io.avaje.http.generator.core.ProcessingContext.typeElement;
import static java.util.stream.Collectors.joining;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Stream;

import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.ProcessingEnvironment;
Expand Down Expand Up @@ -54,11 +58,32 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
APContext.init(processingEnv);
ProcessingContext.init(processingEnv, new ClientPlatformAdapter(), false);
this.componentWriter = new SimpleComponentWriter(metaData);

try {
var file = APContext.getBuildResource("avaje-processors.txt");
var addition = new StringBuilder();
if (file.toFile().exists()) {
var result =
Stream.concat(Files.lines(file), Stream.of("avaje-http-client-generator"))
.distinct()
.collect(joining("\n"));
addition.append(result);
} else {
addition.append("avaje-http-client-generator");
}
Files.writeString(file, addition, StandardOpenOption.CREATE, StandardOpenOption.WRITE);

} catch (IOException e) {
// not an issue worth failing over
}
}

@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment round) {
if (generateComponent || round.errorRaised()) {
if (round.processingOver()) {
ProcessingContext.validateModule();
}
return false;
}
generateComponent = rounds++ > 0;
Expand Down Expand Up @@ -143,7 +168,6 @@ private void writeComponent(boolean processingOver) {
writer.write();
}
writeMetaInf();
ProcessingContext.validateModule();
} catch (final IOException e) {
logError("Error writing component", e);
}
Expand Down
2 changes: 0 additions & 2 deletions http-generator-core/src/main/java/io/avaje/http/generator/core/BaseProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@

import io.avaje.http.generator.core.TypeMap.CustomHandler;
import io.avaje.prism.GenerateAPContext;
import io.avaje.prism.GenerateModuleInfoReader;

@GenerateAPContext
@GenerateModuleInfoReader
@SupportedOptions({
"useJavax",
"useSingleton",
Expand Down
34 changes: 19 additions & 15 deletions http-generator-core/src/main/java/io/avaje/http/generator/core/ProcessingContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,21 +246,25 @@ static Stream<String> superTypes(Element element) {

public static void validateModule() {
var module = APContext.getProjectModuleElement();
if (module != null && !module.isUnnamed()) {
try (var bufferedReader = APContext.getModuleInfoReader()) {
var reader = new ModuleInfoReader(module, bufferedReader);
reader.requires().forEach(r -> {
if (!r.isStatic() && r.getDependency().getQualifiedName().contentEquals("io.avaje.http.api.javalin")) {
logWarn(module, "io.avaje.http.api.javalin only contains SOURCE retention annotations. It should added as `requires static`");
}
});

reader.validateServices("io.avaje.http.client.HttpClient.GeneratedComponent", CTX.get().clientFQN);

} catch (Exception e) {
// can't read module
}
}
APContext.moduleInfoReader()
.ifPresent(
moduleInfo -> {
moduleInfo
.requires()
.forEach(
r -> {
if (!r.isStatic()
&& r.getDependency()
.getQualifiedName()
.contentEquals("io.avaje.http.api.javalin")) {
logWarn(
module,
"io.avaje.http.api.javalin only contains SOURCE retention annotations. It should added as `requires static`");
}
});
moduleInfo.validateServices(
"io.avaje.http.client.HttpClient.GeneratedComponent", CTX.get().clientFQN);
});
}

static ModuleElement getModuleElement(Element e) {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<swagger.version>2.2.41</swagger.version>
<jackson.version>2.14.2</jackson.version>
<jex.version>3.0-RC10</jex.version>
<avaje.prisms.version>1.44</avaje.prisms.version>
<avaje.prisms.version>2.0-RC1</avaje.prisms.version>
<project.build.outputTimestamp>2025-12-01T15:37:17Z</project.build.outputTimestamp>
<module-info.shade>${project.build.directory}${file.separator}module-info.shade</module-info.shade>
</properties>
Expand Down