Skip to content

Prisms 2.0 Module Validation #67

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 #67

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
aebd4b2
prisms 2
SentryMan Dec 1, 2025
5bbc5f9
Update ServiceProcessor.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
2 changes: 1 addition & 1 deletion avaje-spi-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<tag>HEAD</tag>
</scm>
<properties>
<avaje.prisms.version>1.43</avaje.prisms.version>
<avaje.prisms.version>2.0-RC1</avaje.prisms.version>
</properties>

<dependencies>
Expand Down
35 changes: 18 additions & 17 deletions avaje-spi-core/src/main/java/io/avaje/spi/internal/ModuleReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@ final class ModuleReader {
}

private void add(String k, Set<String> v) {
missingServicesMap.put(replace$(k), v.stream().map(ModuleReader::replace$).collect(toSet()));
}

private static String replace$(String k) {
return k.replace('$', '.');
missingServicesMap.put(k, v.stream().collect(toSet()));
}

void read(ModuleInfoReader module) {
Expand All @@ -37,18 +33,23 @@ void read(ModuleInfoReader module) {
break;
}
}
module.provides().forEach(p -> {

final var contract = replace$(p.service());

if (!missingServicesMap.containsKey(contract)) {
return;
}
var impls = p.implementations();
var missing = missingServicesMap.get(contract);

impls.stream().map(ModuleReader::replace$).forEach(missing::remove);
});
module
.provides()
.forEach(
p -> {
final var contract = p.getService().getQualifiedName().toString();
if (!missingServicesMap.containsKey(contract)) {
return;
}
var impls = p.getImplementations();
var missing = missingServicesMap.get(contract);
impls.stream()
.forEach(
x -> {
missing.remove(x.getQualifiedName().toString());
missing.remove(APContext.elements().getBinaryName(x).toString());
});
});
}

boolean staticWarning() {
Expand Down
6 changes: 3 additions & 3 deletions avaje-spi-core/src/main/java/io/avaje/spi/internal/ServiceProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,11 @@
import javax.tools.StandardLocation;

import io.avaje.prism.GenerateAPContext;
import io.avaje.prism.GenerateModuleInfoReader;
import io.avaje.prism.GenerateUtils;

@GenerateUtils
@GenerateAPContext
@SuppressWarnings("exports")
@GenerateModuleInfoReader
@SupportedOptions("buildPlugin")
@SupportedAnnotationTypes({
ServiceProviderPrism.PRISM_TYPE,
Expand Down Expand Up @@ -88,7 +86,9 @@ public SourceVersion getSupportedSourceVersion() {
"avaje-validator-generator",
"io.avaje.validation.spi.ValidationExtension",
"avaje-jsonb-generator",
"io.avaje.jsonb.spi.JsonbExtension");
"io.avaje.jsonb.spi.JsonbExtension",
"avaje-http-client-generator",
"io.avaje.http.client.HttpClient.GeneratedComponent");

private static final Map<String, String> VALID_AVAJE_SPI =
Map.of(
Expand Down
Loading