Skip to content
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

[generators] Remove jsonb generation if no jsontypes available #569

Merged
merged 4 commits into from
Feb 25, 2025
Merged

[generators] Remove jsonb generation if no jsontypes available #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28a6401
remove jsonb generation if no jsontypes available
SentryMan Feb 24, 2025
05ba67d
Extract common JsonB detection into JsonBDetect
rbygrave Feb 25, 2025
a3cabff
Extract common JsonB detection into JsonBDetect, Javalin ControllerWr…
rbygrave Feb 25, 2025
674b6cf
JsonBDetect.addImports() conditional on non-empty json types found
rbygrave Feb 25, 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
39 changes: 38 additions & 1 deletion http-generator-core/src/main/java/io/avaje/http/generator/core/JsonBUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,51 @@

public final class JsonBUtil {

private static final JsonBDetect NO_JSONB = new JsonBDetect();
/**
* Detect JsonB use and handle imports as needed.
*/
public static final class JsonBDetect {
private final Map<String, UType> jsonTypes;

private JsonBDetect() {
this.jsonTypes = Map.of();
}

private JsonBDetect(ControllerReader reader) {
this.jsonTypes = JsonBUtil.jsonTypes(reader);
addImports(reader);
}

private void addImports(ControllerReader reader) {
if (useJsonB()) {
reader.addImportType("io.avaje.jsonb.Jsonb");
reader.addImportType("io.avaje.jsonb.JsonType");
reader.addImportType("io.avaje.jsonb.Types");
jsonTypes.values().stream().map(UType::importTypes).forEach(reader::addImportTypes);
}
}

public boolean useJsonB() {
return !jsonTypes.isEmpty();
}

public Map<String, UType> jsonTypes() {
return jsonTypes;
}
}

private JsonBUtil() {}

public static boolean isJsonMimeType(String producesMimeType) {
return producesMimeType == null || producesMimeType.toLowerCase().contains("application/json");
}

public static Map<String, UType> jsonTypes(ControllerReader reader) {
public static JsonBDetect detect(boolean jsonb, ControllerReader reader) {
return !jsonb ? NO_JSONB : new JsonBDetect(reader);
}

public static Map<String, UType> jsonTypes(ControllerReader reader) {
final Map<String, UType> jsonTypes = new LinkedHashMap<>();
final Consumer<UType> addToMap = uType -> jsonTypes.put(uType.full(), uType);

Expand Down
13 changes: 3 additions & 10 deletions ...enerator-helidon/src/main/java/io/avaje/http/generator/helidon/nima/ControllerWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,11 @@ class ControllerWriter extends BaseControllerWriter {

ControllerWriter(ControllerReader reader, boolean jsonb) throws IOException {
super(reader);
this.useJsonB = jsonb;
final var detectJsonB = JsonBUtil.detect(jsonb, reader);
this.useJsonB = detectJsonB.useJsonB();
this.jsonTypes = detectJsonB.jsonTypes();
if (useJsonB) {
reader.addImportType("io.avaje.jsonb.Jsonb");
reader.addImportType("io.avaje.jsonb.JsonType");
reader.addImportType("io.avaje.jsonb.Types");
reader.addImportType(jsonOutputType());
this.jsonTypes = JsonBUtil.jsonTypes(reader);
jsonTypes.values().stream()
.map(UType::importTypes)
.forEach(reader::addImportTypes);
} else {
this.jsonTypes = Map.of();
}
reader.addImportType("io.helidon.common.media.type.MediaTypes");
reader.addImportType("io.helidon.common.parameters.Parameters");
Expand Down
14 changes: 4 additions & 10 deletions http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,10 @@ class ControllerWriter extends BaseControllerWriter {

ControllerWriter(ControllerReader reader, boolean jsonb) throws IOException {
super(reader);
this.useJsonB = jsonb;
if (useJsonB) {
reader.addImportType("io.avaje.jsonb.Jsonb");
reader.addImportType("io.avaje.jsonb.JsonType");
reader.addImportType("io.avaje.jsonb.Types");
this.jsonTypes = JsonBUtil.jsonTypes(reader);
jsonTypes.values().stream().map(UType::importTypes).forEach(reader::addImportTypes);
} else {
this.jsonTypes = Map.of();
}
final var detectJsonB = JsonBUtil.detect(jsonb, reader);
this.useJsonB = detectJsonB.useJsonB();
this.jsonTypes = detectJsonB.jsonTypes();

reader.addImportType("io.javalin.plugin.Plugin");
if (javalin6) {
reader.addImportType("io.javalin.config.JavalinConfig");
Expand Down
13 changes: 3 additions & 10 deletions http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ class ControllerWriter extends BaseControllerWriter {

ControllerWriter(ControllerReader reader, boolean jsonb) throws IOException {
super(reader);
this.useJsonB = jsonb;
final var detectJsonB = JsonBUtil.detect(jsonb, reader);
this.useJsonB = detectJsonB.useJsonB();
this.jsonTypes = detectJsonB.jsonTypes();
reader.addImportType(API_CONTEXT);
reader.addImportType(API_ROUTING);
reader.addImportType("java.io.IOException");
Expand All @@ -40,15 +42,6 @@ class ControllerWriter extends BaseControllerWriter {
reader.addImportType("io.avaje.jex.htmx.TemplateContentCache");
}
}
if (useJsonB) {
reader.addImportType("io.avaje.jsonb.Jsonb");
reader.addImportType("io.avaje.jsonb.JsonType");
reader.addImportType("io.avaje.jsonb.Types");
this.jsonTypes = JsonBUtil.jsonTypes(reader);
jsonTypes.values().stream().map(UType::importTypes).forEach(reader::addImportTypes);
} else {
this.jsonTypes = Map.of();
}
}

void write() {
Expand Down