Skip to content

Commit ca783c0

Browse files
rbygraverbygrave
committed
Refactor rename internal methods from getters to accessors
No functional change here. Some unused methods removed.
1 parent aa5b6f5 commit ca783c0

19 files changed

+177
-208
lines changed

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

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ final class BeanReader {
4747
this.typeReader = new TypeReader(GenericType.parse(type), beanType, context, importTypes, factory);
4848
typeReader.process();
4949
this.requestParams = new BeanRequestParams(type);
50-
this.name = typeReader.getName();
50+
this.name = typeReader.name();
5151
this.aspects = typeReader.hasAspects();
52-
this.injectMethods = typeReader.getInjectMethods();
53-
this.injectFields = typeReader.getInjectFields();
54-
this.factoryMethods = typeReader.getFactoryMethods();
55-
this.postConstructMethod = typeReader.getPostConstructMethod();
56-
this.preDestroyMethod = typeReader.getPreDestroyMethod();
57-
this.constructor = typeReader.getConstructor();
52+
this.injectMethods = typeReader.injectMethods();
53+
this.injectFields = typeReader.injectFields();
54+
this.factoryMethods = typeReader.factoryMethods();
55+
this.postConstructMethod = typeReader.postConstructMethod();
56+
this.preDestroyMethod = typeReader.preDestroyMethod();
57+
this.constructor = typeReader.constructor();
5858
}
5959

6060
@Override
6161
public String toString() {
6262
return beanType.toString();
6363
}
6464

65-
TypeElement getBeanType() {
65+
TypeElement beanType() {
6666
return beanType;
6767
}
6868

@@ -93,11 +93,11 @@ BeanReader read() {
9393
return this;
9494
}
9595

96-
List<Dependency> getDependsOn() {
96+
List<Dependency> dependsOn() {
9797
List<Dependency> list = new ArrayList<>();
9898
if (constructor != null) {
99-
for (MethodReader.MethodParam param : constructor.getParams()) {
100-
Dependency dependsOn = param.getDependsOn();
99+
for (MethodReader.MethodParam param : constructor.params()) {
100+
Dependency dependsOn = param.dependsOn();
101101
// BeanScope is always injectable with no impact on injection ordering
102102
if (!dependsOn.dependsOn().equals(Constants.BEANSCOPE)) {
103103
list.add(dependsOn);
@@ -107,27 +107,23 @@ List<Dependency> getDependsOn() {
107107
return list;
108108
}
109109

110-
List<MethodReader> getFactoryMethods() {
110+
List<MethodReader> factoryMethods() {
111111
return factoryMethods;
112112
}
113113

114-
List<String> getProvides() {
115-
return typeReader.getProvides();
114+
List<String> provides() {
115+
return typeReader.provides();
116116
}
117117

118118
String autoProvides() {
119119
return typeReader.autoProvides();
120120
}
121121

122-
Set<GenericType> getGenericTypes() {
123-
return typeReader.getGenericTypes();
124-
}
125-
126122
Set<GenericType> allGenericTypes() {
127123
if (allGenericTypes != null) {
128124
return allGenericTypes;
129125
}
130-
allGenericTypes = new LinkedHashSet<>(typeReader.getGenericTypes());
126+
allGenericTypes = new LinkedHashSet<>(typeReader.genericTypes());
131127
for (FieldReader field : injectFields) {
132128
field.addDependsOnGeneric(allGenericTypes);
133129
}
@@ -137,7 +133,7 @@ Set<GenericType> allGenericTypes() {
137133
if (constructor != null) {
138134
constructor.addDependsOnGeneric(allGenericTypes);
139135
}
140-
for (MethodReader factoryMethod : getFactoryMethods()) {
136+
for (MethodReader factoryMethod : factoryMethods()) {
141137
factoryMethod.addDependsOnGeneric(allGenericTypes);
142138
}
143139
return allGenericTypes;
@@ -153,7 +149,7 @@ private String shortName(Element element) {
153149
/**
154150
* Return the key for meta data (type and name)
155151
*/
156-
String getMetaKey() {
152+
String metaKey() {
157153
if (name != null) {
158154
return type + ":" + name;
159155
}
@@ -199,7 +195,7 @@ void buildAddFor(Append writer) {
199195
if (name != null && !name.isEmpty()) {
200196
writer.append("\"%s\", ", name);
201197
}
202-
writer.append(typeReader.getTypesRegister());
198+
writer.append(typeReader.typesRegister());
203199
writer.append(")) {").eol();
204200
}
205201

@@ -253,7 +249,7 @@ private Set<String> importTypes() {
253249
aspects.extraImports(importTypes);
254250

255251
for (MethodReader factoryMethod : factoryMethods) {
256-
Set<GenericType> genericTypes = factoryMethod.getGenericTypes();
252+
Set<GenericType> genericTypes = factoryMethod.genericTypes();
257253
if (!genericTypes.isEmpty()) {
258254
importTypes.add(Constants.TYPE);
259255
importTypes.add(Constants.GENERICTYPE);
@@ -296,7 +292,7 @@ void writeImports(Append writer) {
296292
writer.eol();
297293
}
298294

299-
MethodReader getConstructor() {
295+
MethodReader constructor() {
300296
return constructor;
301297
}
302298

@@ -353,20 +349,20 @@ void writeRequestCreate(Append writer) {
353349
field.writeRequestInject(writer);
354350
}
355351
for (MethodReader method : injectMethods) {
356-
writer.append(" bean.%s(", method.getName());
352+
writer.append(" bean.%s(", method.name());
357353
method.writeRequestConstructor(writer);
358354
writer.append(");").eol();
359355
}
360356
writer.append(" return bean;").eol();
361357
writer.append(" }").eol();
362358
}
363359

364-
List<FieldReader> getInjectFields() {
365-
return typeReader.getInjectFields();
360+
List<FieldReader> injectFields() {
361+
return typeReader.injectFields();
366362
}
367363

368-
List<MethodReader> getInjectMethods() {
369-
return typeReader.getInjectMethods();
364+
List<MethodReader> injectMethods() {
365+
return typeReader.injectMethods();
370366
}
371367

372368
boolean isGenerateProxy() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public String toString() {
2525
return softDependency ? "soft:" + name : name;
2626
}
2727

28-
String getName() {
28+
String name() {
2929
return name;
3030
}
3131

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void addDependsOnGeneric(Set<GenericType> set) {
3434
}
3535
}
3636

37-
String getFieldName() {
37+
String fieldName() {
3838
return element.getSimpleName().toString();
3939
}
4040

@@ -77,7 +77,7 @@ void checkRequest(BeanRequestParams requestParams) {
7777
void writeRequestDependency(Append writer) {
7878
if (!requestParam) {
7979
// just add as field dependency
80-
requestParamName = writer.nextName(getFieldName().toLowerCase());
80+
requestParamName = writer.nextName(fieldName().toLowerCase());
8181
writer.append(" @Inject").eol().append(" ");
8282
type.writeShort(writer);
8383
writer.append(" %s;", requestParamName).eol().eol();
@@ -88,7 +88,7 @@ void writeRequestDependency(Append writer) {
8888
* Generate code to set bean field dependencies as part of BeanFactory create().
8989
*/
9090
void writeRequestInject(Append writer) {
91-
writer.append(" bean.%s = %s;", getFieldName(), requestParamName).eol();
91+
writer.append(" bean.%s = %s;", fieldName(), requestParamName).eol();
9292
}
9393

9494
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.ArrayList;
44
import java.util.List;
55
import java.util.Objects;
6-
import java.util.Set;
76

87
/**
98
* A type with generic parameters and potentially nested.
@@ -158,14 +157,14 @@ String topType() {
158157
/**
159158
* Return the main type.
160159
*/
161-
String getMainType() {
160+
String mainType() {
162161
return mainType;
163162
}
164163

165164
/**
166165
* Return the parameter types.
167166
*/
168-
List<GenericType> getParams() {
167+
List<GenericType> params() {
169168
return params;
170169
}
171170

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private String trimName(String name) {
7474
return "".equals(name) ? null : name;
7575
}
7676

77-
String getBuildName() {
77+
String buildName() {
7878
if (Util.isVoid(type)) {
7979
return "void_" + Util.trimMethod(method);
8080
} else {
@@ -87,7 +87,7 @@ String getBuildName() {
8787
}
8888
}
8989

90-
public String getKey() {
90+
public String key() {
9191
if (Util.isVoid(type)) {
9292
return "method:" + method;
9393
}
@@ -118,32 +118,32 @@ private List<String> asList(String[] content) {
118118
}
119119

120120
void update(BeanReader beanReader) {
121-
this.provides = beanReader.getProvides();
122-
this.dependsOn = beanReader.getDependsOn();
121+
this.provides = beanReader.provides();
122+
this.dependsOn = beanReader.dependsOn();
123123
this.autoProvides = beanReader.autoProvides();
124124
this.generateProxy = beanReader.isGenerateProxy();
125125
}
126126

127-
String getType() {
127+
String type() {
128128
return type;
129129
}
130130

131-
List<String> getProvides() {
131+
List<String> provides() {
132132
return provides;
133133
}
134134

135-
List<Dependency> getDependsOn() {
135+
List<Dependency> dependsOn() {
136136
return dependsOn;
137137
}
138138

139-
String getAutoProvides() {
139+
String autoProvides() {
140140
return autoProvides;
141141
}
142142

143143
/**
144144
* Return the top level package for the bean and the interfaces it implements.
145145
*/
146-
String getTopPackage() {
146+
String topPackage() {
147147
if (method == null || method.isEmpty()) {
148148
return Util.packageOf(type);
149149
}
@@ -183,7 +183,7 @@ void buildMethod(Append append) {
183183
append.append(", autoProvides=\"").append(autoProvides).append("\"");
184184
}
185185
append.append(")").append(NEWLINE);
186-
append.append(" private void build_").append(getBuildName()).append("() {").append(NEWLINE);
186+
append.append(" private void build_").append(buildName()).append("() {").append(NEWLINE);
187187
if (hasMethod()) {
188188
append.append(" ").append(Util.shortMethod(method)).append("(builder");
189189
} else {

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

Lines changed: 18 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ final class MetaDataOrdering {
3030
queue.add(metaData);
3131
}
3232
// register into map keyed by provider
33-
providerAdd(metaData.getType()).add(metaData);
34-
for (String provide : metaData.getProvides()) {
33+
providerAdd(metaData.type()).add(metaData);
34+
for (String provide : metaData.provides()) {
3535
providerAdd(provide).add(metaData);
3636
}
3737
}
@@ -80,12 +80,12 @@ int processQueue() {
8080
private void detectCircularDependency(List<MetaData> remainder) {
8181
final List<DependencyLink> dependencyLinks = new ArrayList<>();
8282
for (MetaData metaData : remainder) {
83-
final List<Dependency> dependsOn = metaData.getDependsOn();
83+
final List<Dependency> dependsOn = metaData.dependsOn();
8484
if (dependsOn != null) {
8585
for (Dependency dependency : dependsOn) {
8686
final MetaData provider = findCircularDependency(remainder, dependency);
8787
if (provider != null) {
88-
dependencyLinks.add(new DependencyLink(metaData, provider, dependency.getName()));
88+
dependencyLinks.add(new DependencyLink(metaData, provider, dependency.name()));
8989
}
9090
}
9191
}
@@ -98,11 +98,11 @@ private void detectCircularDependency(List<MetaData> remainder) {
9898

9999
private MetaData findCircularDependency(List<MetaData> remainder, Dependency dependency) {
100100
for (MetaData metaData : remainder) {
101-
if (metaData.getType().equals(dependency.getName())) {
101+
if (metaData.type().equals(dependency.name())) {
102102
return metaData;
103103
}
104-
final List<String> provides = metaData.getProvides();
105-
if (provides != null && provides.contains(dependency.getName())) {
104+
final List<String> provides = metaData.provides();
105+
if (provides != null && provides.contains(dependency.name())) {
106106
return metaData;
107107
}
108108
}
@@ -133,11 +133,11 @@ void missingDependencies() {
133133
}
134134

135135
private void checkMissingDependencies(MetaData metaData) {
136-
for (Dependency dependency : metaData.getDependsOn()) {
137-
if (providers.get(dependency.getName()) == null && !scopeInfo.providedByOtherScope(dependency.getName())) {
138-
TypeElement element = context.elementMaybe(metaData.getType());
139-
context.logError(element, "No dependency provided for " + dependency + " on " + metaData.getType());
140-
missingDependencyTypes.add(dependency.getName());
136+
for (Dependency dependency : metaData.dependsOn()) {
137+
if (providers.get(dependency.name()) == null && !scopeInfo.providedByOtherScope(dependency.name())) {
138+
TypeElement element = context.elementMaybe(metaData.type());
139+
context.logError(element, "No dependency provided for " + dependency + " on " + metaData.type());
140+
missingDependencyTypes.add(dependency.name());
141141
}
142142
}
143143
}
@@ -152,7 +152,7 @@ private void warnOnDependencies() {
152152
if (!queue.isEmpty()) {
153153
context.logWarn("There are " + queue.size() + " beans with unsatisfied dependencies (assuming external dependencies)");
154154
for (MetaData m : queue) {
155-
context.logWarn("Unsatisfied dependencies on %s dependsOn %s", m, m.getDependsOn());
155+
context.logWarn("Unsatisfied dependencies on %s dependsOn %s", m, m.dependsOn());
156156
}
157157
}
158158
}
@@ -183,14 +183,14 @@ private int processQueueRound(boolean includeExternal) {
183183
}
184184

185185
private boolean allDependenciesWired(MetaData queuedMeta, boolean includeExternal) {
186-
for (Dependency dependency : queuedMeta.getDependsOn()) {
187-
if (!Util.isProvider(dependency.getName())) {
186+
for (Dependency dependency : queuedMeta.dependsOn()) {
187+
if (!Util.isProvider(dependency.name())) {
188188
// check non-provider dependency is satisfied
189-
ProviderList providerList = providers.get(dependency.getName());
189+
ProviderList providerList = providers.get(dependency.name());
190190
if (providerList == null) {
191191
if (!scopeInfo.providedByOther(dependency)) {
192-
if (includeExternal && context.externallyProvided(dependency.getName())) {
193-
autoRequires.add(dependency.getName());
192+
if (includeExternal && context.externallyProvided(dependency.name())) {
193+
autoRequires.add(dependency.name());
194194
queuedMeta.markWithExternalDependency();
195195
} else {
196196
return false;
@@ -222,23 +222,6 @@ Set<String> importTypes() {
222222
return importTypes;
223223
}
224224

225-
/**
226-
* Return the MetaData for the bean that provides the (generic interface) dependency.
227-
*/
228-
MetaData findProviderOf(String depend) {
229-
for (MetaData metaData : orderedList) {
230-
List<String> provides = metaData.getProvides();
231-
if (provides != null) {
232-
for (String provide : provides) {
233-
if (provide.equals(depend)) {
234-
return metaData;
235-
}
236-
}
237-
}
238-
}
239-
return null;
240-
}
241-
242225
/**
243226
* Return true if the beans with unsatisfied dependencies seem
244227
* to form a circular dependency.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ private String value() {
1616

1717
private MetaTopPackage(Collection<MetaData> values) {
1818
for (MetaData metaData : values) {
19-
topPackage = Util.commonParent(topPackage, metaData.getTopPackage());
19+
topPackage = Util.commonParent(topPackage, metaData.topPackage());
2020
}
2121
}
2222
}

0 commit comments

Comments
 (0)