Skip to content

Commit 05779ac

Browse files
rbygraverbygrave
committed
Refactor internals use consistent name context for processingContext
1 parent 69467be commit 05779ac

File tree

5 files changed

+48
-48
lines changed

5 files changed

+48
-48
lines changed

‎inject-generator/src/main/java/io/avaje/inject/generator/MetaDataOrdering.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class MetaDataOrdering {
1616
"rather than constructor injection on one of the dependencies. " +
1717
"\n See https://avaje.io/inject/#circular";
1818

19-
private final ProcessingContext processingContext;
19+
private final ProcessingContext context;
2020

2121
private final List<MetaData> orderedList = new ArrayList<>();
2222

@@ -28,8 +28,8 @@ class MetaDataOrdering {
2828

2929
private String topPackage;
3030

31-
MetaDataOrdering(Collection<MetaData> values, ProcessingContext processingContext) {
32-
this.processingContext = processingContext;
31+
MetaDataOrdering(Collection<MetaData> values, ProcessingContext context) {
32+
this.context = context;
3333

3434
for (MetaData metaData : values) {
3535
if (metaData.noDepends()) {
@@ -100,9 +100,9 @@ private MetaData findCircularDependency(List<MetaData> remainder, String depende
100100
* Log a reasonable compile error for detected circular dependencies.
101101
*/
102102
void errorOnCircularDependencies() {
103-
processingContext.logError("Circular dependencies detected with beans %s %s", circularDependencies, CIRC_ERR_MSG);
103+
context.logError("Circular dependencies detected with beans %s %s", circularDependencies, CIRC_ERR_MSG);
104104
for (DependencyLink link : circularDependencies) {
105-
processingContext.logError("Circular dependency - %s dependsOn %s for %s", link.metaData, link.provider, link.dependency);
105+
context.logError("Circular dependency - %s dependsOn %s for %s", link.metaData, link.provider, link.dependency);
106106
}
107107
}
108108

@@ -112,7 +112,7 @@ void errorOnCircularDependencies() {
112112
*/
113113
void warnOnDependencies() {
114114
for (MetaData m : queue) {
115-
processingContext.logWarn("Unsatisfied dependencies on %s dependsOn %s", m, m.getDependsOn());
115+
context.logWarn("Unsatisfied dependencies on %s dependsOn %s", m, m.getDependsOn());
116116
}
117117
}
118118

‎inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
class MethodReader {
1717

18-
private final ProcessingContext processingContext;
18+
private final ProcessingContext context;
1919
private final ExecutableElement element;
2020
private final String factoryType;
2121
private final TypeMirror returnType;
@@ -32,13 +32,13 @@ class MethodReader {
3232
private String addForType;
3333
private boolean beanLifeCycle;
3434

35-
MethodReader(ProcessingContext processingContext, ExecutableElement element, TypeElement beanType) {
36-
this(processingContext, element, beanType, null, null);
35+
MethodReader(ProcessingContext context, ExecutableElement element, TypeElement beanType) {
36+
this(context, element, beanType, null, null);
3737
}
3838

39-
MethodReader(ProcessingContext processingContext, ExecutableElement element, TypeElement beanType, Bean bean, Named named) {
39+
MethodReader(ProcessingContext context, ExecutableElement element, TypeElement beanType, Bean bean, Named named) {
4040
this.isFactory = bean != null;
41-
this.processingContext = processingContext;
41+
this.context = context;
4242
this.element = element;
4343
this.returnType = element.getReturnType();
4444
this.returnTypeRaw = returnType.toString();
@@ -53,7 +53,7 @@ class MethodReader {
5353
}
5454

5555
private void initInterfaces() {
56-
Element element = processingContext.asElement(returnType);
56+
Element element = context.asElement(returnType);
5757
if (element instanceof TypeElement) {
5858
TypeElement te = (TypeElement) element;
5959
if (te.getKind() == ElementKind.INTERFACE) {

‎inject-generator/src/main/java/io/avaje/inject/generator/Processor.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
public class Processor extends AbstractProcessor {
3030

31-
private ProcessingContext processingContext;
31+
private ProcessingContext context;
3232

3333
private Elements elementUtils;
3434

@@ -51,7 +51,7 @@ public SourceVersion getSupportedSourceVersion() {
5151
@Override
5252
public synchronized void init(ProcessingEnvironment processingEnv) {
5353
super.init(processingEnv);
54-
this.processingContext = new ProcessingContext(processingEnv);
54+
this.context = new ProcessingContext(processingEnv);
5555
this.elementUtils = processingEnv.getElementUtils();
5656
}
5757

@@ -97,40 +97,40 @@ private void writeBeanHelpers() {
9797
for (BeanReader beanReader : beanReaders) {
9898
try {
9999
if (!beanReader.isWrittenToFile()) {
100-
SimpleBeanWriter writer = new SimpleBeanWriter(beanReader, processingContext);
100+
SimpleBeanWriter writer = new SimpleBeanWriter(beanReader, context);
101101
writer.write();
102102
beanReader.setWrittenToFile();
103103
}
104104
} catch (FilerException e) {
105-
processingContext.logWarn("FilerException to write $di class " + beanReader.getBeanType() + " " + e.getMessage());
105+
context.logWarn("FilerException to write $di class " + beanReader.getBeanType() + " " + e.getMessage());
106106

107107
} catch (IOException e) {
108108
e.printStackTrace();
109-
processingContext.logError(beanReader.getBeanType(), "Failed to write $di class");
109+
context.logError(beanReader.getBeanType(), "Failed to write $di class");
110110
}
111111
}
112112
}
113113

114114
private void writeBeanFactory() {
115115

116-
MetaDataOrdering ordering = new MetaDataOrdering(metaData.values(), processingContext);
116+
MetaDataOrdering ordering = new MetaDataOrdering(metaData.values(), context);
117117
int remaining = ordering.processQueue();
118118
if (remaining > 0) {
119119
if (ordering.hasCircularDependencies()) {
120120
ordering.errorOnCircularDependencies();
121121
} else {
122-
processingContext.logWarn("there are " + remaining + " beans with unsatisfied dependencies (assuming external dependencies)");
122+
context.logWarn("there are " + remaining + " beans with unsatisfied dependencies (assuming external dependencies)");
123123
ordering.warnOnDependencies();
124124
}
125125
}
126126

127127
try {
128-
SimpleFactoryWriter factoryWriter = new SimpleFactoryWriter(ordering, processingContext);
128+
SimpleFactoryWriter factoryWriter = new SimpleFactoryWriter(ordering, context);
129129
factoryWriter.write();
130130
} catch (FilerException e) {
131-
processingContext.logWarn("FilerException trying to write factory " + e.getMessage());
131+
context.logWarn("FilerException trying to write factory " + e.getMessage());
132132
} catch (IOException e) {
133-
processingContext.logError("Failed to write factory " + e.getMessage());
133+
context.logError("Failed to write factory " + e.getMessage());
134134
}
135135
}
136136

@@ -140,12 +140,12 @@ private void writeBeanFactory() {
140140
private void readChangedBeans(Set<? extends Element> beans, boolean factory) {
141141
for (Element element : beans) {
142142
if (!(element instanceof TypeElement)) {
143-
processingContext.logError("unexpected type [" + element + "]");
143+
context.logError("unexpected type [" + element + "]");
144144
} else {
145145
if (readBeans.add(element.toString())) {
146146
readBeanMeta((TypeElement) element, factory);
147147
} else {
148-
processingContext.logDebug("skipping already processed bean " + element);
148+
context.logDebug("skipping already processed bean " + element);
149149
}
150150
}
151151
}
@@ -157,7 +157,7 @@ private void readChangedBeans(Set<? extends Element> beans, boolean factory) {
157157
private void mergeMetaData() {
158158
for (BeanReader beanReader : beanReaders) {
159159
if (beanReader.isRequestScoped()) {
160-
processingContext.logDebug("skipping request scoped processed bean " + beanReader);
160+
context.logDebug("skipping request scoped processed bean " + beanReader);
161161
} else {
162162
String metaKey = beanReader.getMetaKey();
163163
MetaData metaData = this.metaData.get(metaKey);
@@ -194,10 +194,10 @@ private void updateMeta(MetaData metaData, BeanReader beanReader) {
194194
private void readBeanMeta(TypeElement typeElement, boolean factory) {
195195

196196
if (typeElement.getKind() == ElementKind.ANNOTATION_TYPE) {
197-
processingContext.logDebug("skipping annotation type " + typeElement);
197+
context.logDebug("skipping annotation type " + typeElement);
198198
return;
199199
}
200-
BeanReader beanReader = new BeanReader(typeElement, processingContext);
200+
BeanReader beanReader = new BeanReader(typeElement, context);
201201
beanReader.read(factory);
202202
beanReaders.add(beanReader);
203203
}
@@ -207,7 +207,7 @@ private void readBeanMeta(TypeElement typeElement, boolean factory) {
207207
*/
208208
private void readModule(RoundEnvironment roundEnv) {
209209

210-
String factory = processingContext.loadMetaInfServices();
210+
String factory = context.loadMetaInfServices();
211211
if (factory != null) {
212212
TypeElement factoryType = elementUtils.getTypeElement(factory);
213213
if (factoryType != null) {
@@ -222,7 +222,7 @@ private void readModule(RoundEnvironment roundEnv) {
222222
Element element = iterator.next();
223223
ContextModule annotation = element.getAnnotation(ContextModule.class);
224224
if (annotation != null) {
225-
processingContext.setContextDetails(annotation.name(), annotation.provides(), annotation.dependsOn(), element);
225+
context.setContextDetails(annotation.name(), annotation.provides(), annotation.dependsOn(), element);
226226
}
227227
}
228228
}
@@ -236,7 +236,7 @@ private void readModule(RoundEnvironment roundEnv) {
236236
private void readFactory(TypeElement factoryType) {
237237

238238
ContextModule module = factoryType.getAnnotation(ContextModule.class);
239-
processingContext.setContextDetails(module.name(), module.provides(), module.dependsOn(), factoryType);
239+
context.setContextDetails(module.name(), module.provides(), module.dependsOn(), factoryType);
240240

241241
List<? extends Element> elements = factoryType.getEnclosedElements();
242242
if (elements != null) {
@@ -249,7 +249,7 @@ private void readFactory(TypeElement factoryType) {
249249
// read a build method - DependencyMeta
250250
DependencyMeta meta = element.getAnnotation(DependencyMeta.class);
251251
if (meta == null) {
252-
processingContext.logError("Missing @DependencyMeta on method " + simpleName.toString());
252+
context.logError("Missing @DependencyMeta on method " + simpleName.toString());
253253
} else {
254254
final MetaData metaData = new MetaData(meta);
255255
this.metaData.put(metaData.getKey(), metaData);

‎inject-generator/src/main/java/io/avaje/inject/generator/SimpleBeanWriter.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
class SimpleBeanWriter {
1414

1515
private final BeanReader beanReader;
16-
private final ProcessingContext ctx;
16+
private final ProcessingContext context;
1717
private final String originName;
1818
private final String shortName;
1919
private final String packageName;
2020
private final String suffix;
2121
private Append writer;
2222

23-
SimpleBeanWriter(BeanReader beanReader, ProcessingContext ctx) {
23+
SimpleBeanWriter(BeanReader beanReader, ProcessingContext context) {
2424
this.beanReader = beanReader;
25-
this.ctx = ctx;
25+
this.context = context;
2626
TypeElement origin = beanReader.getBeanType();
2727
this.originName = origin.getQualifiedName().toString();
2828
this.shortName = origin.getSimpleName().toString();
@@ -31,7 +31,7 @@ class SimpleBeanWriter {
3131
}
3232

3333
private Writer createFileWriter() throws IOException {
34-
JavaFileObject jfo = ctx.createWriter(originName + suffix);
34+
JavaFileObject jfo = context.createWriter(originName + suffix);
3535
return jfo.openWriter();
3636
}
3737

@@ -86,7 +86,7 @@ private void writeStaticFactoryMethod() {
8686

8787
MethodReader constructor = beanReader.getConstructor();
8888
if (constructor == null) {
89-
ctx.logError(beanReader.getBeanType(), "Unable to determine constructor to use?");
89+
context.logError(beanReader.getBeanType(), "Unable to determine constructor to use?");
9090
return;
9191
}
9292

@@ -163,7 +163,7 @@ private void writeClassEnd() {
163163
}
164164

165165
private void writeClassStart() {
166-
if (ctx.isGeneratedAvailable()) {
166+
if (context.isGeneratedAvailable()) {
167167
writer.append(Constants.AT_GENERATED).eol();
168168
}
169169
if (beanReader.isRequestScoped()) {

‎inject-generator/src/main/java/io/avaje/inject/generator/SimpleFactoryWriter.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
class SimpleFactoryWriter {
1212

1313
private final MetaDataOrdering ordering;
14-
private final ProcessingContext processingContext;
14+
private final ProcessingContext context;
1515

1616
private final String factoryPackage;
1717
private final String factoryShortName;
1818
private final String factoryFullName;
1919

2020
private Append writer;
2121

22-
SimpleFactoryWriter(MetaDataOrdering ordering, ProcessingContext processingContext) {
22+
SimpleFactoryWriter(MetaDataOrdering ordering, ProcessingContext context) {
2323
this.ordering = ordering;
24-
this.processingContext = processingContext;
24+
this.context = context;
2525

26-
String pkg = processingContext.getContextPackage();
26+
String pkg = context.getContextPackage();
2727
this.factoryPackage = (pkg != null) ? pkg : ordering.getTopPackage();
28-
processingContext.deriveContextName(factoryPackage);
28+
context.deriveContextName(factoryPackage);
2929
this.factoryShortName = "_di$BeanContextFactory";
3030
this.factoryFullName = factoryPackage + "." + factoryShortName;
3131
}
@@ -48,7 +48,7 @@ void write() throws IOException {
4848
private void writeServicesFile() {
4949

5050
try {
51-
FileObject jfo = processingContext.createMetaInfWriter();
51+
FileObject jfo = context.createMetaInfWriter();
5252
if (jfo != null) {
5353
Writer writer = jfo.openWriter();
5454
writer.write(factoryFullName);
@@ -57,7 +57,7 @@ private void writeServicesFile() {
5757

5858
} catch (IOException e) {
5959
e.printStackTrace();
60-
processingContext.logError("Failed to write services file " + e.getMessage());
60+
context.logError("Failed to write services file " + e.getMessage());
6161
}
6262
}
6363

@@ -84,7 +84,7 @@ private void writePackage() {
8484

8585
writer.append("package %s;", factoryPackage).eol().eol();
8686

87-
final String generated = processingContext.getGeneratedAnnotation();
87+
final String generated = context.getGeneratedAnnotation();
8888
if (generated != null) {
8989
writer.append("import %s;", generated).eol();
9090
}
@@ -105,13 +105,13 @@ private void writePackage() {
105105

106106
private void writeStartClass() {
107107

108-
processingContext.buildAtContextModule(writer);
108+
context.buildAtContextModule(writer);
109109

110110
writer.append("public class %s implements BeanContextFactory {", factoryShortName).eol().eol();
111111
writer.append(" private final Builder builder;").eol().eol();
112112

113113
writer.append(" public %s() {", factoryShortName).eol();
114-
processingContext.buildNewBuilder(writer);
114+
context.buildNewBuilder(writer);
115115
writer.append(" }").eol().eol();
116116

117117
writer.append(" @Override").eol();
@@ -135,7 +135,7 @@ private void writeEndClass() {
135135
}
136136

137137
private Writer createFileWriter() throws IOException {
138-
JavaFileObject jfo = processingContext.createWriter(factoryFullName);
138+
JavaFileObject jfo = context.createWriter(factoryFullName);
139139
return jfo.openWriter();
140140
}
141141
}

0 commit comments

Comments
 (0)