Skip to content

Commit 776579d

Browse files
nakamura-tonakamura-to
committed
Simplify messages that are used in annotation processing
1 parent 0ac66d5 commit 776579d

23 files changed

+211
-958
lines changed

‎src/main/java/org/seasar/doma/internal/apt/meta/dao/DaoMetaFactory.java‎

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,7 @@ protected void doDaoElement(TypeElement interfaceElement, DaoMeta daoMeta) {
7373
String suffix = ctx.getOptions().getDaoSuffix();
7474
if (name.endsWith(suffix)) {
7575
ctx.getNotifier()
76-
.notify(
77-
Kind.WARNING,
78-
Message.DOMA4026,
79-
interfaceElement,
80-
new Object[] {suffix, interfaceElement.getQualifiedName()});
76+
.notify(Kind.WARNING, Message.DOMA4026, interfaceElement, new Object[] {suffix});
8177
}
8278
daoMeta.setName(name);
8379
daoMeta.setDaoElement(interfaceElement);
@@ -160,18 +156,13 @@ protected void validateInterface(TypeElement interfaceElement, DaoMeta daoMeta)
160156
if (!interfaceElement.getKind().isInterface()) {
161157
DaoAnnot daoAnnot = daoMeta.getDaoAnnot();
162158
throw new AptException(
163-
Message.DOMA4014,
164-
interfaceElement,
165-
daoAnnot.getAnnotationMirror(),
166-
new Object[] {interfaceElement.getQualifiedName()});
159+
Message.DOMA4014, interfaceElement, daoAnnot.getAnnotationMirror(), new Object[] {});
167160
}
168161
if (interfaceElement.getNestingKind().isNested()) {
169-
throw new AptException(
170-
Message.DOMA4017, interfaceElement, new Object[] {interfaceElement.getQualifiedName()});
162+
throw new AptException(Message.DOMA4017, interfaceElement, new Object[] {});
171163
}
172164
if (!interfaceElement.getTypeParameters().isEmpty()) {
173-
throw new AptException(
174-
Message.DOMA4059, interfaceElement, new Object[] {interfaceElement.getQualifiedName()});
165+
throw new AptException(Message.DOMA4059, interfaceElement, new Object[] {});
175166
}
176167
}
177168

@@ -207,15 +198,10 @@ protected void doParentDao(DaoMeta daoMeta) {
207198
throw new AptException(
208199
Message.DOMA4440,
209200
daoMeta.getDaoElement(),
210-
new Object[] {
211-
nonDefaultMethod.getSimpleName(), daoMeta.getDaoElement().getQualifiedName()
212-
});
201+
new Object[] {nonDefaultMethod.getSimpleName()});
213202
}
214203
if (daoMeta.getParentDaoMeta() != null) {
215-
throw new AptException(
216-
Message.DOMA4188,
217-
daoMeta.getDaoElement(),
218-
new Object[] {daoMeta.getDaoElement().getQualifiedName()});
204+
throw new AptException(Message.DOMA4188, daoMeta.getDaoElement(), new Object[] {});
219205
}
220206
ParentDaoMeta parentDaoMeta = new ParentDaoMeta(daoAnnot);
221207
parentDaoMeta.setDaoType(typeElement.asType());
@@ -279,21 +265,12 @@ protected void validateMethod(ExecutableElement methodElement, DaoMeta daoMeta)
279265
Message.DOMA4087,
280266
methodElement,
281267
new Object[] {
282-
foundAnnotationTypeElement.getQualifiedName(),
283-
typeElement.getQualifiedName(),
284-
daoMeta.getDaoElement().getQualifiedName(),
285-
methodElement.getSimpleName()
268+
foundAnnotationTypeElement.getQualifiedName(), typeElement.getQualifiedName()
286269
});
287270
}
288271
if (methodElement.isDefault()) {
289272
throw new AptException(
290-
Message.DOMA4252,
291-
methodElement,
292-
new Object[] {
293-
typeElement.getQualifiedName(),
294-
daoMeta.getDaoElement().getQualifiedName(),
295-
methodElement.getSimpleName()
296-
});
273+
Message.DOMA4252, methodElement, new Object[] {typeElement.getQualifiedName()});
297274
}
298275
foundAnnotationTypeElement = typeElement;
299276
}
@@ -307,10 +284,7 @@ protected QueryMeta createQueryMeta(ExecutableElement method, DaoMeta daoMeta) {
307284
return queryMeta;
308285
}
309286
}
310-
throw new AptException(
311-
Message.DOMA4005,
312-
method,
313-
new Object[] {daoMeta.getDaoElement().getQualifiedName(), method.getSimpleName()});
287+
throw new AptException(Message.DOMA4005, method, new Object[] {});
314288
}
315289

316290
protected void validateFiles(TypeElement interfaceElement, DaoMeta daoMeta) {

‎src/main/java/org/seasar/doma/internal/apt/meta/domain/DomainMetaFactory.java‎

Lines changed: 14 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void doWrapperCtType(TypeElement classElement, DomainMeta domainMeta) {
9898
classElement,
9999
domainAnnot.getAnnotationMirror(),
100100
domainAnnot.getValueType(),
101-
new Object[] {domainAnnot.getValueTypeValue(), classElement.getQualifiedName()});
101+
new Object[] {domainAnnot.getValueTypeValue()});
102102
}
103103
domainMeta.setBasicCtType(basicCtType);
104104
domainMeta.setWrapperCtType(basicCtType.getWrapperCtType());
@@ -113,7 +113,7 @@ public void validateAcceptNull(TypeElement classElement, DomainMeta domainMeta)
113113
classElement,
114114
domainAnnot.getAnnotationMirror(),
115115
domainAnnot.getAcceptNull(),
116-
new Object[] {classElement.getQualifiedName()});
116+
new Object[] {});
117117
}
118118
}
119119

@@ -122,8 +122,7 @@ public void validateClass(TypeElement classElement, DomainMeta domainMeta) {
122122
if (classElement.getKind() == ElementKind.CLASS) {
123123
if (domainMeta.providesConstructor()
124124
&& classElement.getModifiers().contains(Modifier.ABSTRACT)) {
125-
throw new AptException(
126-
Message.DOMA4132, classElement, new Object[] {classElement.getQualifiedName()});
125+
throw new AptException(Message.DOMA4132, classElement, new Object[] {});
127126
}
128127
if (classElement.getNestingKind().isNested()) {
129128
validateEnclosingElement(classElement);
@@ -136,26 +135,22 @@ public void validateClass(TypeElement classElement, DomainMeta domainMeta) {
136135
classElement,
137136
domainAnnot.getAnnotationMirror(),
138137
domainAnnot.getFactoryMethod(),
139-
new Object[] {classElement.getQualifiedName()});
138+
new Object[] {});
140139
}
141140
if (classElement.getNestingKind().isNested()) {
142141
validateEnclosingElement(classElement);
143142
}
144143
} else if (classElement.getKind() == ElementKind.INTERFACE) {
145144
if (domainMeta.providesConstructor()) {
146-
throw new AptException(
147-
Message.DOMA4268, classElement, new Object[] {classElement.getQualifiedName()});
145+
throw new AptException(Message.DOMA4268, classElement, new Object[] {});
148146
}
149147
if (classElement.getNestingKind().isNested()) {
150148
validateEnclosingElement(classElement);
151149
}
152150
} else {
153151
DomainAnnot domainAnnot = domainMeta.getDomainAnnot();
154152
throw new AptException(
155-
Message.DOMA4105,
156-
classElement,
157-
domainAnnot.getAnnotationMirror(),
158-
new Object[] {classElement.getQualifiedName()});
153+
Message.DOMA4105, classElement, domainAnnot.getAnnotationMirror(), new Object[] {});
159154
}
160155
}
161156

@@ -212,9 +207,7 @@ protected void validateConstructor(TypeElement classElement, DomainMeta domainMe
212207
}
213208
}
214209
throw new AptException(
215-
Message.DOMA4103,
216-
classElement,
217-
new Object[] {domainMeta.getValueType(), classElement.getQualifiedName()});
210+
Message.DOMA4103, classElement, new Object[] {domainMeta.getValueType()});
218211
}
219212

220213
protected void validateFactoryMethod(TypeElement classElement, DomainMeta domainMeta) {
@@ -260,11 +253,7 @@ protected void validateFactoryMethod(TypeElement classElement, DomainMeta domain
260253
Message.DOMA4106,
261254
classElement,
262255
new Object[] {
263-
domainMeta.getFactoryMethod(),
264-
classElement.asType(),
265-
domainMeta.getValueType(),
266-
domainMeta.getFactoryMethod(),
267-
classElement.getQualifiedName()
256+
domainMeta.getFactoryMethod(), classElement.asType(), domainMeta.getValueType()
268257
});
269258
}
270259

@@ -305,11 +294,7 @@ public void validateAccessorMethod(TypeElement classElement, DomainMeta domainMe
305294
throw new AptException(
306295
Message.DOMA4104,
307296
classElement,
308-
new Object[] {
309-
domainMeta.getAccessorMethod(),
310-
domainMeta.getValueType(),
311-
classElement.getQualifiedName()
312-
});
297+
new Object[] {domainMeta.getAccessorMethod(), domainMeta.getValueType()});
313298
}
314299

315300
protected TypeMirror inferType(
@@ -355,7 +340,7 @@ public void validateInitializer(TypeElement classElement, DomainMeta domainMeta)
355340
classElement,
356341
valueAnnot.getAnnotationMirror(),
357342
valueAnnot.getStaticConstructor(),
358-
new Object[] {classElement.getQualifiedName()});
343+
new Object[] {});
359344
}
360345
}
361346

@@ -370,9 +355,7 @@ public void validateAccessorMethod(TypeElement classElement, DomainMeta domainMe
370355
classElement,
371356
domainAnnot.getAnnotationMirror(),
372357
domainAnnot.getAccessorMethod(),
373-
new Object[] {
374-
accessorMethod, domainMeta.getAccessorMethod(), classElement.getQualifiedName()
375-
});
358+
new Object[] {});
376359
}
377360
}
378361

@@ -395,24 +378,15 @@ protected VariableElement findSingleField(TypeElement classElement, DomainMeta d
395378
.filter(field -> !field.getModifiers().contains(Modifier.STATIC))
396379
.collect(Collectors.toList());
397380
if (fields.size() == 0) {
398-
throw new AptException(
399-
Message.DOMA4430, classElement, new Object[] {classElement.getQualifiedName()});
381+
throw new AptException(Message.DOMA4430, classElement, new Object[] {});
400382
}
401383
if (fields.size() > 1) {
402-
throw new AptException(
403-
Message.DOMA4431, classElement, new Object[] {classElement.getQualifiedName()});
384+
throw new AptException(Message.DOMA4431, classElement, new Object[] {});
404385
}
405386
VariableElement field = fields.get(0);
406387
if (!ctx.getTypes().isAssignable(field.asType(), domainMeta.getValueType())) {
407388
throw new AptException(
408-
Message.DOMA4432,
409-
field,
410-
new Object[] {
411-
field.asType(),
412-
domainMeta.getValueType(),
413-
classElement.getQualifiedName(),
414-
field.getSimpleName()
415-
});
389+
Message.DOMA4432, field, new Object[] {field.asType(), domainMeta.getValueType()});
416390
}
417391
return field;
418392
}

‎src/main/java/org/seasar/doma/internal/apt/meta/domain/ExternalDomainMetaFactory.java‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,17 @@ public ExternalDomainMeta createTypeElementMeta(TypeElement convElement) {
4949

5050
protected void validateConverter(TypeElement convElement) {
5151
if (!ctx.getTypes().isAssignable(convElement.asType(), DomainConverter.class)) {
52-
throw new AptException(
53-
Message.DOMA4191, convElement, new Object[] {convElement.getQualifiedName()});
52+
throw new AptException(Message.DOMA4191, convElement, new Object[] {});
5453
}
5554
if (convElement.getNestingKind().isNested()) {
56-
throw new AptException(
57-
Message.DOMA4198, convElement, new Object[] {convElement.getQualifiedName()});
55+
throw new AptException(Message.DOMA4198, convElement, new Object[] {});
5856
}
5957
if (convElement.getModifiers().contains(Modifier.ABSTRACT)) {
60-
throw new AptException(
61-
Message.DOMA4192, convElement, new Object[] {convElement.getQualifiedName()});
58+
throw new AptException(Message.DOMA4192, convElement, new Object[] {});
6259
}
6360
ExecutableElement constructor = ctx.getElements().getNoArgConstructor(convElement);
6461
if (constructor == null || !constructor.getModifiers().contains(Modifier.PUBLIC)) {
65-
throw new AptException(
66-
Message.DOMA4193, convElement, new Object[] {convElement.getQualifiedName()});
62+
throw new AptException(Message.DOMA4193, convElement, new Object[] {});
6763
}
6864
}
6965

@@ -99,9 +95,7 @@ protected void doDomainType(
9995
PackageElement pkgElement = ctx.getElements().getPackageOf(domainElement);
10096
if (pkgElement.isUnnamed()) {
10197
throw new AptException(
102-
Message.DOMA4197,
103-
convElement,
104-
new Object[] {domainElement.getQualifiedName(), convElement.getQualifiedName()});
98+
Message.DOMA4197, convElement, new Object[] {domainElement.getQualifiedName()});
10599
}
106100
DeclaredType declaredType = ctx.getTypes().toDeclaredType(domainType);
107101
if (declaredType == null) {
@@ -110,9 +104,7 @@ protected void doDomainType(
110104
for (TypeMirror typeArg : declaredType.getTypeArguments()) {
111105
if (typeArg.getKind() != TypeKind.WILDCARD) {
112106
throw new AptException(
113-
Message.DOMA4203,
114-
convElement,
115-
new Object[] {domainElement.getQualifiedName(), convElement.getQualifiedName()});
107+
Message.DOMA4203, convElement, new Object[] {domainElement.getQualifiedName()});
116108
}
117109
}
118110
meta.setDomainElement(domainElement);
@@ -153,10 +145,7 @@ protected void doValueType(
153145

154146
BasicCtType basicCtType = ctx.getCtTypes().newBasicCtType(valueType);
155147
if (basicCtType == null) {
156-
throw new AptException(
157-
Message.DOMA4194,
158-
convElement,
159-
new Object[] {valueTypeName, convElement.getQualifiedName()});
148+
throw new AptException(Message.DOMA4194, convElement, new Object[] {valueTypeName});
160149
}
161150
meta.setBasicCtType(basicCtType);
162151
}

0 commit comments

Comments
 (0)