Skip to content

Commit 1b5847c

Browse files
committed
fix test
1 parent 9070568 commit 1b5847c

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

jsonb-generator/src/main/java/io/avaje/jsonb/generator/BeanReader.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package io.avaje.jsonb.generator;
22

3-
import io.avaje.jsonb.Json;
4-
5-
import javax.lang.model.element.Element;
6-
import javax.lang.model.element.TypeElement;
73
import java.util.HashSet;
84
import java.util.List;
5+
import java.util.Map;
96
import java.util.Set;
107
import java.util.TreeSet;
118

9+
import javax.lang.model.element.Element;
10+
import javax.lang.model.element.TypeElement;
11+
12+
import io.avaje.jsonb.Json;
13+
1214
class BeanReader {
1315

1416
private final TypeElement beanType;

jsonb-generator/src/main/java/io/avaje/jsonb/generator/Processor.java

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

3-
import io.avaje.jsonb.Json;
3+
import java.io.IOException;
4+
import java.util.ArrayList;
5+
import java.util.HashMap;
6+
import java.util.HashSet;
7+
import java.util.LinkedHashSet;
8+
import java.util.List;
9+
import java.util.Map;
10+
import java.util.Set;
11+
import java.util.TreeSet;
12+
import java.util.stream.Collectors;
413

514
import javax.annotation.processing.AbstractProcessor;
615
import javax.annotation.processing.ProcessingEnvironment;
@@ -9,8 +18,8 @@
918
import javax.lang.model.element.Element;
1019
import javax.lang.model.element.ElementKind;
1120
import javax.lang.model.element.TypeElement;
12-
import java.io.IOException;
13-
import java.util.*;
21+
22+
import io.avaje.jsonb.Json;
1423

1524
public class Processor extends AbstractProcessor {
1625

@@ -62,7 +71,9 @@ private void readModule() {
6271
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment round) {
6372
readModule();
6473
writeAdapters(round.getElementsAnnotatedWith(Json.class));
65-
writeAdaptersForImported(round.getElementsAnnotatedWith(Json.Import.class));
74+
writeAdaptersForImported(
75+
round.getElementsAnnotatedWith(Json.Import.class),
76+
round.getElementsAnnotatedWith(Json.MixIn.class));
6677
initialiseComponent();
6778
cascadeTypes();
6879
writeComponent(round.processingOver());

jsonb-generator/src/main/java/io/avaje/jsonb/generator/TypeReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class TypeReader {
3232
private TypeSubTypeMeta currentSubType;
3333
private boolean nonAccessibleField;
3434

35-
private final Map<String, Element> mixInFields;
35+
private final Map<String, Element> mixInFields;
3636

3737
TypeReader(TypeElement baseType, ProcessingContext context, NamingConvention namingConvention) {
3838
this.baseType = baseType;

0 commit comments

Comments
 (0)