Skip to content

Commit 3cf733c

Browse files
nakamura-tonakamura-to
committed
Change signature of AptException contructors
1 parent 6566aad commit 3cf733c

31 files changed

+48
-393
lines changed

‎src/main/java/org/seasar/doma/internal/apt/AptException.java‎

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package org.seasar.doma.internal.apt;
22

3-
import javax.annotation.processing.ProcessingEnvironment;
43
import javax.lang.model.element.AnnotationMirror;
54
import javax.lang.model.element.AnnotationValue;
65
import javax.lang.model.element.Element;
76
import javax.tools.Diagnostic.Kind;
87
import org.seasar.doma.DomaException;
9-
import org.seasar.doma.message.Message;
108
import org.seasar.doma.message.MessageResource;
119

1210
public class AptException extends DomaException {
@@ -21,42 +19,34 @@ public class AptException extends DomaException {
2119

2220
protected AnnotationValue annotationValue;
2321

24-
public AptException(
25-
MessageResource messageResource, ProcessingEnvironment env, Element element, Object[] args) {
26-
this(messageResource, env, Kind.ERROR, element, null, null, null, args);
22+
public AptException(MessageResource messageResource, Element element, Object[] args) {
23+
this(messageResource, Kind.ERROR, element, null, null, null, args);
2724
}
2825

2926
public AptException(
30-
MessageResource messageResource,
31-
ProcessingEnvironment env,
32-
Element element,
33-
Throwable cause,
34-
Object[] args) {
35-
this(messageResource, env, Kind.ERROR, element, null, null, cause, args);
27+
MessageResource messageResource, Element element, Throwable cause, Object[] args) {
28+
this(messageResource, Kind.ERROR, element, null, null, cause, args);
3629
}
3730

3831
public AptException(
3932
MessageResource messageResource,
40-
ProcessingEnvironment env,
4133
Element element,
4234
AnnotationMirror annotationMirror,
4335
Object[] args) {
44-
this(messageResource, env, Kind.ERROR, element, annotationMirror, null, null, args);
36+
this(messageResource, Kind.ERROR, element, annotationMirror, null, null, args);
4537
}
4638

4739
public AptException(
4840
MessageResource messageResource,
49-
ProcessingEnvironment env,
5041
Element element,
5142
AnnotationMirror annotationMirror,
5243
AnnotationValue annotationValue,
5344
Object[] args) {
54-
this(messageResource, env, Kind.ERROR, element, annotationMirror, annotationValue, null, args);
45+
this(messageResource, Kind.ERROR, element, annotationMirror, annotationValue, null, args);
5546
}
5647

5748
private AptException(
5849
MessageResource messageResource,
59-
ProcessingEnvironment env,
6050
Kind kind,
6151
Element element,
6252
AnnotationMirror annotationMirror,
@@ -68,9 +58,6 @@ private AptException(
6858
this.element = element;
6959
this.annotationMirror = annotationMirror;
7060
this.annotationValue = annotationValue;
71-
if (new Context(env).getOptions().isDebugEnabled()) {
72-
new Context(env).getNotifier().debug(Message.DOMA4074, new Object[] {messageResource, cause});
73-
}
7461
}
7562

7663
public Kind getKind() {

‎src/main/java/org/seasar/doma/internal/apt/generator/AbstractGenerator.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,7 @@ protected void throwExceptionIfNecessary() {
134134
if (ioException != null) {
135135
formatter.close();
136136
throw new AptException(
137-
Message.DOMA4079,
138-
ctx.getEnv(),
139-
typeElement,
140-
ioException,
141-
new Object[] {canonicalName, ioException});
137+
Message.DOMA4079, typeElement, ioException, new Object[] {canonicalName, ioException});
142138
}
143139
}
144140

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

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ protected void validateUserDefinedConfig(
102102
if (configElement.getModifiers().contains(Modifier.ABSTRACT)) {
103103
throw new AptException(
104104
Message.DOMA4163,
105-
ctx.getEnv(),
106105
daoMeta.getDaoElement(),
107106
daoAnnot.getAnnotationMirror(),
108107
daoAnnot.getConfig(),
@@ -126,7 +125,6 @@ protected void validateUserDefinedConfig(
126125
} else {
127126
throw new AptException(
128127
Message.DOMA4164,
129-
ctx.getEnv(),
130128
daoMeta.getDaoElement(),
131129
daoAnnot.getAnnotationMirror(),
132130
daoAnnot.getConfig(),
@@ -150,7 +148,6 @@ protected void validateUserDefinedConfig(
150148
} else {
151149
throw new AptException(
152150
Message.DOMA4255,
153-
ctx.getEnv(),
154151
daoMeta.getDaoElement(),
155152
daoAnnot.getAnnotationMirror(),
156153
daoAnnot.getConfig(),
@@ -164,24 +161,17 @@ protected void validateInterface(TypeElement interfaceElement, DaoMeta daoMeta)
164161
DaoAnnot daoAnnot = daoMeta.getDaoAnnot();
165162
throw new AptException(
166163
Message.DOMA4014,
167-
ctx.getEnv(),
168164
interfaceElement,
169165
daoAnnot.getAnnotationMirror(),
170166
new Object[] {interfaceElement.getQualifiedName()});
171167
}
172168
if (interfaceElement.getNestingKind().isNested()) {
173169
throw new AptException(
174-
Message.DOMA4017,
175-
ctx.getEnv(),
176-
interfaceElement,
177-
new Object[] {interfaceElement.getQualifiedName()});
170+
Message.DOMA4017, interfaceElement, new Object[] {interfaceElement.getQualifiedName()});
178171
}
179172
if (!interfaceElement.getTypeParameters().isEmpty()) {
180173
throw new AptException(
181-
Message.DOMA4059,
182-
ctx.getEnv(),
183-
interfaceElement,
184-
new Object[] {interfaceElement.getQualifiedName()});
174+
Message.DOMA4059, interfaceElement, new Object[] {interfaceElement.getQualifiedName()});
185175
}
186176
}
187177

@@ -216,7 +206,6 @@ protected void doParentDao(DaoMeta daoMeta) {
216206
}
217207
throw new AptException(
218208
Message.DOMA4440,
219-
ctx.getEnv(),
220209
daoMeta.getDaoElement(),
221210
new Object[] {
222211
nonDefaultMethod.getSimpleName(), daoMeta.getDaoElement().getQualifiedName()
@@ -225,7 +214,6 @@ protected void doParentDao(DaoMeta daoMeta) {
225214
if (daoMeta.getParentDaoMeta() != null) {
226215
throw new AptException(
227216
Message.DOMA4188,
228-
ctx.getEnv(),
229217
daoMeta.getDaoElement(),
230218
new Object[] {daoMeta.getDaoElement().getQualifiedName()});
231219
}
@@ -289,7 +277,6 @@ protected void validateMethod(ExecutableElement methodElement, DaoMeta daoMeta)
289277
if (foundAnnotationTypeElement != null) {
290278
throw new AptException(
291279
Message.DOMA4087,
292-
ctx.getEnv(),
293280
methodElement,
294281
new Object[] {
295282
foundAnnotationTypeElement.getQualifiedName(),
@@ -301,7 +288,6 @@ protected void validateMethod(ExecutableElement methodElement, DaoMeta daoMeta)
301288
if (methodElement.isDefault()) {
302289
throw new AptException(
303290
Message.DOMA4252,
304-
ctx.getEnv(),
305291
methodElement,
306292
new Object[] {
307293
typeElement.getQualifiedName(),
@@ -323,7 +309,6 @@ protected QueryMeta createQueryMeta(ExecutableElement method, DaoMeta daoMeta) {
323309
}
324310
throw new AptException(
325311
Message.DOMA4005,
326-
ctx.getEnv(),
327312
method,
328313
new Object[] {daoMeta.getDaoElement().getQualifiedName(), method.getSimpleName()});
329314
}

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

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ public void doWrapperCtType(TypeElement classElement, DomainMeta domainMeta) {
9595
DomainAnnot domainAnnot = domainMeta.getDomainAnnot();
9696
throw new AptException(
9797
Message.DOMA4102,
98-
ctx.getEnv(),
9998
classElement,
10099
domainAnnot.getAnnotationMirror(),
101100
domainAnnot.getValueType(),
@@ -111,7 +110,6 @@ public void validateAcceptNull(TypeElement classElement, DomainMeta domainMeta)
111110
DomainAnnot domainAnnot = domainMeta.getDomainAnnot();
112111
throw new AptException(
113112
Message.DOMA4251,
114-
ctx.getEnv(),
115113
classElement,
116114
domainAnnot.getAnnotationMirror(),
117115
domainAnnot.getAcceptNull(),
@@ -125,10 +123,7 @@ public void validateClass(TypeElement classElement, DomainMeta domainMeta) {
125123
if (domainMeta.providesConstructor()
126124
&& classElement.getModifiers().contains(Modifier.ABSTRACT)) {
127125
throw new AptException(
128-
Message.DOMA4132,
129-
ctx.getEnv(),
130-
classElement,
131-
new Object[] {classElement.getQualifiedName()});
126+
Message.DOMA4132, classElement, new Object[] {classElement.getQualifiedName()});
132127
}
133128
if (classElement.getNestingKind().isNested()) {
134129
validateEnclosingElement(classElement);
@@ -138,7 +133,6 @@ public void validateClass(TypeElement classElement, DomainMeta domainMeta) {
138133
DomainAnnot domainAnnot = domainMeta.getDomainAnnot();
139134
throw new AptException(
140135
Message.DOMA4184,
141-
ctx.getEnv(),
142136
classElement,
143137
domainAnnot.getAnnotationMirror(),
144138
domainAnnot.getFactoryMethod(),
@@ -150,10 +144,7 @@ public void validateClass(TypeElement classElement, DomainMeta domainMeta) {
150144
} else if (classElement.getKind() == ElementKind.INTERFACE) {
151145
if (domainMeta.providesConstructor()) {
152146
throw new AptException(
153-
Message.DOMA4268,
154-
ctx.getEnv(),
155-
classElement,
156-
new Object[] {classElement.getQualifiedName()});
147+
Message.DOMA4268, classElement, new Object[] {classElement.getQualifiedName()});
157148
}
158149
if (classElement.getNestingKind().isNested()) {
159150
validateEnclosingElement(classElement);
@@ -162,7 +153,6 @@ public void validateClass(TypeElement classElement, DomainMeta domainMeta) {
162153
DomainAnnot domainAnnot = domainMeta.getDomainAnnot();
163154
throw new AptException(
164155
Message.DOMA4105,
165-
ctx.getEnv(),
166156
classElement,
167157
domainAnnot.getAnnotationMirror(),
168158
new Object[] {classElement.getQualifiedName()});
@@ -178,10 +168,7 @@ protected void validateEnclosingElement(Element element) {
178168
if (simpleName.contains(Constants.BINARY_NAME_DELIMITER)
179169
|| simpleName.contains(Constants.METATYPE_NAME_DELIMITER)) {
180170
throw new AptException(
181-
Message.DOMA4277,
182-
ctx.getEnv(),
183-
typeElement,
184-
new Object[] {typeElement.getQualifiedName()});
171+
Message.DOMA4277, typeElement, new Object[] {typeElement.getQualifiedName()});
185172
}
186173
NestingKind nestingKind = typeElement.getNestingKind();
187174
if (nestingKind == NestingKind.TOP_LEVEL) {
@@ -192,17 +179,11 @@ protected void validateEnclosingElement(Element element) {
192179
validateEnclosingElement(typeElement.getEnclosingElement());
193180
} else {
194181
throw new AptException(
195-
Message.DOMA4275,
196-
ctx.getEnv(),
197-
typeElement,
198-
new Object[] {typeElement.getQualifiedName()});
182+
Message.DOMA4275, typeElement, new Object[] {typeElement.getQualifiedName()});
199183
}
200184
} else {
201185
throw new AptException(
202-
Message.DOMA4276,
203-
ctx.getEnv(),
204-
typeElement,
205-
new Object[] {typeElement.getQualifiedName()});
186+
Message.DOMA4276, typeElement, new Object[] {typeElement.getQualifiedName()});
206187
}
207188
}
208189

@@ -232,7 +213,6 @@ protected void validateConstructor(TypeElement classElement, DomainMeta domainMe
232213
}
233214
throw new AptException(
234215
Message.DOMA4103,
235-
ctx.getEnv(),
236216
classElement,
237217
new Object[] {domainMeta.getValueType(), classElement.getQualifiedName()});
238218
}
@@ -278,7 +258,6 @@ protected void validateFactoryMethod(TypeElement classElement, DomainMeta domain
278258
}
279259
throw new AptException(
280260
Message.DOMA4106,
281-
ctx.getEnv(),
282261
classElement,
283262
new Object[] {
284263
domainMeta.getFactoryMethod(),
@@ -325,7 +304,6 @@ public void validateAccessorMethod(TypeElement classElement, DomainMeta domainMe
325304
}
326305
throw new AptException(
327306
Message.DOMA4104,
328-
ctx.getEnv(),
329307
classElement,
330308
new Object[] {
331309
domainMeta.getAccessorMethod(),
@@ -374,7 +352,6 @@ public void validateInitializer(TypeElement classElement, DomainMeta domainMeta)
374352
if (!valueAnnot.getStaticConstructorValue().isEmpty()) {
375353
throw new AptException(
376354
Message.DOMA4428,
377-
ctx.getEnv(),
378355
classElement,
379356
valueAnnot.getAnnotationMirror(),
380357
valueAnnot.getStaticConstructor(),
@@ -390,7 +367,6 @@ public void validateAccessorMethod(TypeElement classElement, DomainMeta domainMe
390367
DomainAnnot domainAnnot = domainMeta.getDomainAnnot();
391368
throw new AptException(
392369
Message.DOMA4429,
393-
ctx.getEnv(),
394370
classElement,
395371
domainAnnot.getAnnotationMirror(),
396372
domainAnnot.getAccessorMethod(),
@@ -420,23 +396,16 @@ protected VariableElement findSingleField(TypeElement classElement, DomainMeta d
420396
.collect(Collectors.toList());
421397
if (fields.size() == 0) {
422398
throw new AptException(
423-
Message.DOMA4430,
424-
ctx.getEnv(),
425-
classElement,
426-
new Object[] {classElement.getQualifiedName()});
399+
Message.DOMA4430, classElement, new Object[] {classElement.getQualifiedName()});
427400
}
428401
if (fields.size() > 1) {
429402
throw new AptException(
430-
Message.DOMA4431,
431-
ctx.getEnv(),
432-
classElement,
433-
new Object[] {classElement.getQualifiedName()});
403+
Message.DOMA4431, classElement, new Object[] {classElement.getQualifiedName()});
434404
}
435405
VariableElement field = fields.get(0);
436406
if (!ctx.getTypes().isAssignable(field.asType(), domainMeta.getValueType())) {
437407
throw new AptException(
438408
Message.DOMA4432,
439-
ctx.getEnv(),
440409
field,
441410
new Object[] {
442411
field.asType(),

0 commit comments

Comments
 (0)