Skip to content

Commit 3bd775c

Browse files
rbygraverbygrave
committed
Refactor rename methods to use accessor style (from getter style)
1 parent 5c3ca08 commit 3bd775c

File tree

28 files changed

+186
-187
lines changed

28 files changed

+186
-187
lines changed

‎http-generator-client/src/main/java/io/avaje/http/generator/client/ClientMethodWriter.java‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,32 @@ class ClientMethodWriter {
2626
ClientMethodWriter(MethodReader method, Append writer, ProcessingContext ctx) {
2727
this.method = method;
2828
this.writer = writer;
29-
this.webMethod = method.getWebMethod();
29+
this.webMethod = method.webMethod();
3030
this.ctx = ctx;
31-
this.returnType = Util.parseType(method.getReturnType());
31+
this.returnType = Util.parseType(method.returnType());
3232
}
3333

3434
void addImportTypes(ControllerReader reader) {
3535
reader.addImportTypes(returnType.importTypes());
36-
for (MethodParam param : method.getParams()) {
36+
for (MethodParam param : method.params()) {
3737
param.addImports(reader);
3838
}
3939
}
4040

4141
private void methodStart(Append writer) {
42-
for (MethodParam param : method.getParams()) {
42+
for (MethodParam param : method.params()) {
4343
checkBodyHandler(param);
4444
}
45-
writer.append(" // %s %s", webMethod, method.getWebMethodPath()).eol();
45+
writer.append(" // %s %s", webMethod, method.webMethodPath()).eol();
4646
writer.append(" @Override").eol();
4747
writer.append(" public %s%s %s(", methodGenericParams, returnType.shortType(), method.simpleName());
4848
int count = 0;
49-
for (MethodParam param : method.getParams()) {
49+
for (MethodParam param : method.params()) {
5050
if (count++ > 0) {
5151
writer.append(", ");
5252
}
53-
writer.append(param.getUType().shortType()).append(" ");
54-
writer.append(param.getName());
53+
writer.append(param.utype().shortType()).append(" ");
54+
writer.append(param.name());
5555
}
5656
writer.append(") {").eol();
5757
}
@@ -60,10 +60,10 @@ private void methodStart(Append writer) {
6060
* Assign a method parameter as *the* BodyHandler.
6161
*/
6262
private void checkBodyHandler(MethodParam param) {
63-
if (param.getRawType().startsWith(BODY_HANDLER)) {
63+
if (param.rawType().startsWith(BODY_HANDLER)) {
6464
param.setResponseHandler();
6565
bodyHandlerParam = param;
66-
methodGenericParams = param.getUType().genericParams();
66+
methodGenericParams = param.utype().genericParams();
6767
}
6868
}
6969

@@ -75,8 +75,8 @@ void write() {
7575
}
7676
writer.append("clientContext.request()").eol();
7777

78-
PathSegments pathSegments = method.getPathSegments();
79-
Set<PathSegments.Segment> segments = pathSegments.getSegments();
78+
PathSegments pathSegments = method.pathSegments();
79+
Set<PathSegments.Segment> segments = pathSegments.segments();
8080

8181
writeHeaders();
8282
writePaths(segments);
@@ -88,7 +88,7 @@ void write() {
8888
}
8989

9090
private void writeEnd() {
91-
WebMethod webMethod = method.getWebMethod();
91+
WebMethod webMethod = method.webMethod();
9292
writer.append(" .%s()", webMethod.name()).eol();
9393
if (returnType == UType.VOID) {
9494
writer.append(" .asVoid();").eol();
@@ -144,57 +144,57 @@ private void writeResponse(String type0, String type1) {
144144

145145
private void writeWithHandler() {
146146
if (bodyHandlerParam != null) {
147-
writer.append(".handler(%s);", bodyHandlerParam.getName()).eol();
147+
writer.append(".handler(%s);", bodyHandlerParam.name()).eol();
148148
} else {
149149
writer.append(".handler(responseHandler);").eol(); // Better to barf here?
150150
}
151151
}
152152

153153
private void writeQueryParams(PathSegments pathSegments) {
154-
for (MethodParam param : method.getParams()) {
155-
ParamType paramType = param.getParamType();
154+
for (MethodParam param : method.params()) {
155+
ParamType paramType = param.paramType();
156156
if (paramType == ParamType.QUERYPARAM) {
157-
if (pathSegments.segment(param.getParamName()) == null) {
157+
if (pathSegments.segment(param.paramName()) == null) {
158158
if (isMap(param)) {
159-
writer.append(" .queryParam(%s)", param.getName()).eol();
159+
writer.append(" .queryParam(%s)", param.name()).eol();
160160
} else {
161-
writer.append(" .queryParam(\"%s\", %s)", param.getParamName(), param.getName()).eol();
161+
writer.append(" .queryParam(\"%s\", %s)", param.paramName(), param.name()).eol();
162162
}
163163
}
164164
}
165165
}
166166
}
167167

168168
private void writeHeaders() {
169-
for (MethodParam param : method.getParams()) {
170-
ParamType paramType = param.getParamType();
169+
for (MethodParam param : method.params()) {
170+
ParamType paramType = param.paramType();
171171
if (paramType == ParamType.HEADER) {
172172
if (isMap(param)) {
173-
writer.append(" .header(%s)", param.getName()).eol();
173+
writer.append(" .header(%s)", param.name()).eol();
174174
} else {
175-
writer.append(" .header(\"%s\", %s)", param.getParamName(), param.getName()).eol();
175+
writer.append(" .header(\"%s\", %s)", param.paramName(), param.name()).eol();
176176
}
177177
}
178178
}
179179
}
180180

181181
private void writeBeanParams(PathSegments segments) {
182-
for (MethodParam param : method.getParams()) {
183-
final String varName = param.getName();
184-
ParamType paramType = param.getParamType();
182+
for (MethodParam param : method.params()) {
183+
final String varName = param.name();
184+
ParamType paramType = param.paramType();
185185
PathSegments.Segment segment = segments.segment(varName);
186186
if (segment == null && paramType == ParamType.BEANPARAM) {
187-
TypeElement formBeanType = ctx.getTypeElement(param.getRawType());
188-
BeanParamReader form = new BeanParamReader(ctx, formBeanType, param.getName(), param.getShortType(), ParamType.QUERYPARAM);
187+
TypeElement formBeanType = ctx.typeElement(param.rawType());
188+
BeanParamReader form = new BeanParamReader(ctx, formBeanType, param.name(), param.shortType(), ParamType.QUERYPARAM);
189189
form.writeFormParams(writer);
190190
}
191191
}
192192
}
193193

194194
private void writeFormParams(PathSegments segments) {
195-
for (MethodParam param : method.getParams()) {
196-
final String varName = param.getName();
197-
ParamType paramType = param.getParamType();
195+
for (MethodParam param : method.params()) {
196+
final String varName = param.name();
197+
ParamType paramType = param.paramType();
198198
PathSegments.Segment segment = segments.segment(varName);
199199
if (segment == null) {
200200
// not a path or matrix parameter
@@ -206,22 +206,22 @@ private void writeFormParams(PathSegments segments) {
206206
private void writeFormParam(MethodParam param, ParamType paramType) {
207207
if (paramType == ParamType.FORMPARAM) {
208208
if (isMap(param)) {
209-
writer.append(" .formParam(%s)", param.getName()).eol();
209+
writer.append(" .formParam(%s)", param.name()).eol();
210210
} else {
211-
writer.append(" .formParam(\"%s\", %s)", param.getParamName(), param.getName()).eol();
211+
writer.append(" .formParam(\"%s\", %s)", param.paramName(), param.name()).eol();
212212
}
213213
} else if (paramType == ParamType.FORM) {
214-
TypeElement formBeanType = ctx.getTypeElement(param.getRawType());
215-
BeanParamReader form = new BeanParamReader(ctx, formBeanType, param.getName(), param.getShortType(), ParamType.FORMPARAM);
214+
TypeElement formBeanType = ctx.typeElement(param.rawType());
215+
BeanParamReader form = new BeanParamReader(ctx, formBeanType, param.name(), param.shortType(), ParamType.FORMPARAM);
216216
form.writeFormParams(writer);
217217
}
218218
}
219219

220220
private void writeBody() {
221-
for (MethodParam param : method.getParams()) {
222-
ParamType paramType = param.getParamType();
221+
for (MethodParam param : method.params()) {
222+
ParamType paramType = param.paramType();
223223
if (paramType == ParamType.BODY) {
224-
writer.append(" .body(%s)", param.getName()).eol();
224+
writer.append(" .body(%s)", param.name()).eol();
225225
}
226226
}
227227
}
@@ -244,7 +244,7 @@ private void writePaths(Set<PathSegments.Segment> segments) {
244244
}
245245

246246
private boolean isMap(MethodParam param) {
247-
return isMap(param.getUType().mainType());
247+
return isMap(param.utype().mainType());
248248
}
249249

250250
private boolean isMap(String type0) {

‎http-generator-client/src/main/java/io/avaje/http/generator/client/ClientProcessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private void writeForImported(Element importedElement) {
8787
private void writeImported(String fullName) {
8888
// trim .class suffix
8989
String apiClassName = fullName.substring(0, fullName.length() - 6);
90-
TypeElement typeElement = ctx.getTypeElement(apiClassName);
90+
TypeElement typeElement = ctx.typeElement(apiClassName);
9191
if (typeElement != null) {
9292
writeClient(typeElement);
9393
}
@@ -101,7 +101,7 @@ private void writeClient(Element controller) {
101101
generatedClients.add(writeClientAdapter(ctx, reader));
102102
} catch (Throwable e) {
103103
e.printStackTrace();
104-
ctx.logError(reader.getBeanType(), "Failed to write client class " + e);
104+
ctx.logError(reader.beanType(), "Failed to write client class " + e);
105105
}
106106
}
107107
}

‎http-generator-client/src/main/java/io/avaje/http/generator/client/ClientWriter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected String initPackageName(String originName) {
3636
}
3737

3838
private void readMethods() {
39-
for (MethodReader method : reader.getMethods()) {
39+
for (MethodReader method : reader.methods()) {
4040
if (method.isWebMethod()) {
4141
ClientMethodWriter methodWriter = new ClientMethodWriter(method, writer, ctx);
4242
methodWriter.addImportTypes(reader);

‎http-generator-core/src/main/java/io/avaje/http/generator/core/BaseControllerWriter.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ protected BaseControllerWriter(ControllerReader reader, ProcessingContext ctx, S
2727
this.reader = reader;
2828
this.ctx = ctx;
2929
this.router = "$Route".equals(suffix);
30-
TypeElement origin = reader.getBeanType();
30+
TypeElement origin = reader.beanType();
3131
this.originName = origin.getQualifiedName().toString();
3232
this.shortName = origin.getSimpleName().toString();
3333
this.packageName = initPackageName(originName);
@@ -50,7 +50,7 @@ protected void initWriter() throws IOException {
5050
}
5151

5252
protected Writer createFileWriter() throws IOException {
53-
JavaFileObject jfo = ctx.createWriter(fullName, reader.getBeanType());
53+
JavaFileObject jfo = ctx.createWriter(fullName, reader.beanType());
5454
return jfo.openWriter();
5555
}
5656

@@ -64,11 +64,11 @@ protected void writeImports() {
6464
if (router) {
6565
writer.append(Constants.IMPORT_PATH_TYPE_CONVERT).eol();
6666
}
67-
for (String type : reader.getStaticImportTypes()) {
67+
for (String type : reader.staticImportTypes()) {
6868
writer.append("import static %s;", type).eol();
6969
}
7070
writer.eol();
71-
for (String type : reader.getImportTypes()) {
71+
for (String type : reader.importTypes()) {
7272
writer.append("import %s;", type).eol();
7373
}
7474
writer.eol();

‎http-generator-core/src/main/java/io/avaje/http/generator/core/BaseProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private void writeControllerAdapter(Element controller) {
9393
writeControllerAdapter(ctx, reader);
9494
} catch (Throwable e) {
9595
e.printStackTrace();
96-
ctx.logError(reader.getBeanType(), "Failed to write $Route class " + e);
96+
ctx.logError(reader.beanType(), "Failed to write $Route class " + e);
9797
}
9898
}
9999
}

‎http-generator-core/src/main/java/io/avaje/http/generator/core/BeanParamReader.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private void read() {
4242

4343
private void readField(Element enclosedElement) {
4444
FieldReader field = new FieldReader(ctx, enclosedElement, defaultParamType);
45-
fieldMap.put(field.getVarName(), field);
45+
fieldMap.put(field.varName(), field);
4646
}
4747

4848
private void readMethod(ExecutableElement enclosedElement) {
@@ -104,13 +104,13 @@ private Set<String> writeConstructorParams(Append writer) {
104104

105105
public void writeFormParams(Append writer) {
106106
for (FieldReader field : fieldMap.values()) {
107-
ExecutableElement getter = findGetter(field.getVarName());
108-
ParamType paramType = field.element.getParamType();
107+
ExecutableElement getter = findGetter(field.varName());
108+
ParamType paramType = field.element.paramType();
109109
String type = propertyParamType(paramType);
110110
if (type != null) {
111-
String accessor = (getter != null) ? getter.toString() : field.isPublic() ? field.getVarName() : null;
111+
String accessor = (getter != null) ? getter.toString() : field.isPublic() ? field.varName() : null;
112112
if (accessor != null) {
113-
writer.append(" .%s(\"%s\", %s.%s)", type, field.getParamName(), beanVarName, accessor).eol();
113+
writer.append(" .%s(\"%s\", %s.%s)", type, field.paramName(), beanVarName, accessor).eol();
114114
}
115115
}
116116
}
@@ -152,15 +152,15 @@ static class FieldReader {
152152
}
153153

154154
boolean isPublic() {
155-
return element.getElement().getModifiers().contains(Modifier.PUBLIC);
155+
return element.element().getModifiers().contains(Modifier.PUBLIC);
156156
}
157157

158-
String getParamName() {
159-
return element.getParamName();
158+
String paramName() {
159+
return element.paramName();
160160
}
161161

162-
String getVarName() {
163-
return element.getVarName();
162+
String varName() {
163+
return element.varName();
164164
}
165165

166166
@Override
@@ -187,7 +187,7 @@ void writeSet(Append writer, String beanVarName) {
187187

188188
} else {
189189
// populate via field put
190-
writer.append("%s %s.%s = ", ctx.platform().indent(), beanVarName, getVarName());
190+
writer.append("%s %s.%s = ", ctx.platform().indent(), beanVarName, varName());
191191
element.setValue(writer);
192192
writer.append(";").eol();
193193
}

‎http-generator-core/src/main/java/io/avaje/http/generator/core/ControllerReader.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ private boolean initHasValid() {
133133
return findAnnotation(Valid.class) != null;
134134
}
135135

136-
String getProduces() {
136+
String produces() {
137137
return produces;
138138
}
139139

140-
public TypeElement getBeanType() {
140+
public TypeElement beanType() {
141141
return beanType;
142142
}
143143

@@ -237,15 +237,15 @@ private void readMethod(ExecutableElement method, DeclaredType declaredType) {
237237
}
238238
}
239239

240-
public List<String> getRoles() {
240+
public List<String> roles() {
241241
return roles;
242242
}
243243

244-
public List<MethodReader> getMethods() {
244+
public List<MethodReader> methods() {
245245
return methods;
246246
}
247247

248-
public String getPath() {
248+
public String path() {
249249
Path path = findAnnotation(Path.class);
250250
if (path == null) {
251251
return null;
@@ -269,11 +269,11 @@ public void addStaticImportType(String rawType) {
269269
staticImportTypes.add(rawType);
270270
}
271271

272-
public Set<String> getStaticImportTypes() {
272+
public Set<String> staticImportTypes() {
273273
return staticImportTypes;
274274
}
275275

276-
public Set<String> getImportTypes() {
276+
public Set<String> importTypes() {
277277
return importTypes;
278278
}
279279

0 commit comments

Comments
 (0)