Skip to content

Commit 67f7962

Browse files
committed
don't need a whole record
1 parent e449374 commit 67f7962

File tree

4 files changed

+19
-25
lines changed

4 files changed

+19
-25
lines changed

.gitignore

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,8 @@ build/
33
.idea/
44
*.iml
55
.gradle
6-
http-generator-nima/.settings/org.eclipse.m2e.core.prefs
7-
http-generator-nima/.settings/org.eclipse.jdt.core.prefs
8-
http-generator-nima/.settings/org.eclipse.jdt.apt.core.prefs
9-
http-generator-nima/.settings/org.eclipse.core.resources.prefs
10-
http-generator-nima/.project
11-
http-generator-nima/.classpath
126
*.prefs
13-
tests/test-nima/.classpath
14-
tests/test-nima/.factorypath
15-
tests/test-nima/.project
16-
*.class
17-
tests/test-nima-jsonb/.classpath
7+
*.class*
8+
*.factorypath
9+
*.project
10+
*.processors

http-generator-nima/src/main/java/io/avaje/http/generator/helidon/nima/ControllerMethodWriter.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.avaje.http.generator.helidon.nima;
22

3+
import java.util.AbstractMap.SimpleImmutableEntry;
34
import java.util.List;
45
import java.util.Map;
56
import java.util.Optional;
@@ -23,14 +24,14 @@ class ControllerMethodWriter {
2324
private final WebMethod webMethod;
2425
private final ProcessingContext ctx;
2526
private final boolean useJsonB;
26-
private final Map<String, JsonbType> jsonTypes;
27+
private final Map<String, SimpleImmutableEntry<String, String>> jsonTypes;
2728

2829
ControllerMethodWriter(
2930
MethodReader method,
3031
Append writer,
3132
ProcessingContext ctx,
3233
boolean useJsonB,
33-
Map<String, JsonbType> jsonTypes) {
34+
Map<String, SimpleImmutableEntry<String, String>> jsonTypes) {
3435
this.method = method;
3536
this.writer = writer;
3637
webMethod = method.getWebMethod();
@@ -59,7 +60,7 @@ void writeHandler(boolean requestScoped) {
5960
.getUType()
6061
.full()
6162
.transform(jsonTypes::get)
62-
.fieldName();
63+
.getValue();
6364
writer
6465
.append(
6566
" var %s = %sJsonType.fromJson(req.content().inputStream());",
@@ -129,7 +130,7 @@ void writeHandler(boolean requestScoped) {
129130
if (producesJson()) {
130131

131132
final var fieldName =
132-
method.getReturnType().toString().transform(jsonTypes::get).fieldName();
133+
method.getReturnType().toString().transform(jsonTypes::get).getValue();
133134
writer.append(" %sJsonType.toJson(result, res.outputStream());", fieldName).eol();
134135
} else {
135136
writer.append(" res.send(result);").eol();

http-generator-nima/src/main/java/io/avaje/http/generator/helidon/nima/ControllerWriter.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.avaje.http.generator.helidon.nima;
22

33
import java.io.IOException;
4+
import java.util.AbstractMap.SimpleImmutableEntry;
45
import java.util.HashMap;
56
import java.util.List;
67
import java.util.Map;
@@ -22,7 +23,7 @@ class ControllerWriter extends BaseControllerWriter {
2223

2324
private static final String AT_GENERATED = "@Generated(\"avaje-helidon-nima-generator\")";
2425
private final boolean useJsonB;
25-
private final Map<String, JsonbType> jsonTypes;
26+
private final Map<String, SimpleImmutableEntry<String, String>> jsonTypes;
2627

2728
ControllerWriter(ControllerReader reader, ProcessingContext ctx, boolean jsonB)
2829
throws IOException {
@@ -152,8 +153,10 @@ public void writeFieldJsonBodyType(MethodReader methodReader) {
152153
type -> {
153154
final var baseType = getBaseType(param.getUType());
154155
final var fieldName = createFieldName(baseType, type);
155-
writer.append("private final JsonType<%s> %sJsonType;", type, fieldName).eol();
156-
return new JsonbType(baseType, fieldName);
156+
writer
157+
.append("private final JsonType<%s> %sJsonType;", type, fieldName)
158+
.eol();
159+
return new SimpleImmutableEntry<>(baseType, fieldName);
157160
});
158161
});
159162
}
@@ -170,7 +173,7 @@ public void writeFieldJsonReturnType(MethodReader methodReader) {
170173
final var baseType = getBaseType(fullType);
171174
final var fieldName = createFieldName(baseType, type);
172175
writer.append("private final JsonType<%s> %sJsonType;", type, fieldName).eol();
173-
return new JsonbType(baseType, fieldName);
176+
return new SimpleImmutableEntry<>(baseType, fieldName);
174177
});
175178
} else if (methodReader.getReturnType() instanceof final PrimitiveType fullType) {
176179

@@ -182,7 +185,7 @@ public void writeFieldJsonReturnType(MethodReader methodReader) {
182185
? "Integer"
183186
: type.substring(0, 1).toUpperCase() + type.substring(1);
184187
writer.append("private final JsonType<%s> %sJsonType;", baseType, type).eol();
185-
return new JsonbType(baseType, type);
188+
return new SimpleImmutableEntry<>(baseType, type);
186189
});
187190
} else {
188191
throw new UnsupportedOperationException(
@@ -194,8 +197,8 @@ public void writeJsonBTypeAssignments() {
194197
for (final var entry : jsonTypes.entrySet()) {
195198
final var fullType = entry.getKey();
196199
final var element = entry.getValue();
197-
final var fieldName = element.fieldName();
198-
final var baseType = element.baseType();
200+
final var baseType = element.getKey();
201+
final var fieldName = element.getValue();
199202

200203
writer.append(" this.%sJsonType = jsonB.type(%s.class)", fieldName, baseType);
201204

http-generator-nima/src/main/java/io/avaje/http/generator/helidon/nima/JsonbType.java

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)