Skip to content

Commit fd240dd

Browse files
yDelouisWonderCsabo
yDelouis
authored and
WonderCsabo
committed
Migrate param validation to new API
1 parent 4da2436 commit fd240dd

20 files changed

Lines changed: 63 additions & 46 deletions

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterExtrasHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
4242

4343
validatorHelper.doesntThrowException(executableElement, valid);
4444

45-
validatorHelper.param.zeroParameter(executableElement, valid);
45+
validatorHelper.param.noParam().validate(executableElement, valid);
4646
}
4747

4848
@Override

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterInjectHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
4242

4343
validatorHelper.doesntThrowException(executableElement, valid);
4444

45-
validatorHelper.param.zeroParameter(executableElement, valid);
45+
validatorHelper.param.noParam().validate(executableElement, valid);
4646
}
4747

4848
@Override

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterPreferencesHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
4343

4444
validatorHelper.doesntThrowException(executableElement, valid);
4545

46-
validatorHelper.param.zeroParameter(executableElement, valid);
46+
validatorHelper.param.noParam().validate(executableElement, valid);
4747
}
4848

4949
@Override

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AfterViewsHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
4242

4343
validatorHelper.doesntThrowException(executableElement, valid);
4444

45-
validatorHelper.param.zeroParameter(executableElement, valid);
45+
validatorHelper.param.noParam().validate(executableElement, valid);
4646
}
4747

4848
@Override

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/CheckedChangeHandler.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
5151
ExecutableElement executableElement = (ExecutableElement) element;
5252
validatorHelper.returnTypeIsVoid(executableElement, valid);
5353

54-
validatorHelper.param.hasZeroOrOneCompoundButtonParameter(executableElement, valid);
55-
56-
validatorHelper.param.hasZeroOrOneBooleanParameter(executableElement, valid);
57-
58-
validatorHelper.param.hasNoOtherParameterThanCompoundButtonOrBoolean(executableElement, valid);
54+
validatorHelper.param.anyOrder() //
55+
.type(CanonicalNameConstants.COMPOUND_BUTTON).optional() //
56+
.primitiveOrWrapper(TypeKind.BOOLEAN).optional() //
57+
.validate(executableElement, valid);
5958
}
6059

6160
@Override

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/EditorActionHandler.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,11 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
5353

5454
validatorHelper.returnTypeIsVoidOrBoolean(executableElement, valid);
5555

56-
validatorHelper.param.hasAtMostOneTextViewParameter(executableElement, valid);
57-
58-
validatorHelper.param.hasAtMostOneIntegerParameter(executableElement, valid);
59-
60-
validatorHelper.param.hasAtMostOneKeyEventParameter(executableElement, valid);
61-
62-
validatorHelper.param.hasNoOtherParameterFromATextViewAnIntegerAndAKeyEvent(executableElement, valid);
56+
validatorHelper.param.anyOrder() //
57+
.type(CanonicalNameConstants.TEXT_VIEW).optional() //
58+
.primitiveOrWrapper(TypeKind.INT).optional() //
59+
.type(CanonicalNameConstants.KEY_EVENT).optional() //
60+
.validate(executableElement, valid);
6361
}
6462

6563
@Override

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FocusChangeHandler.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,10 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
5252

5353
validatorHelper.returnTypeIsVoid(executableElement, valid);
5454

55-
validatorHelper.param.hasZeroOrOneViewParameter(executableElement, valid);
56-
57-
validatorHelper.param.hasZeroOrOneBooleanParameter(executableElement, valid);
58-
59-
validatorHelper.param.hasNoOtherParameterThanViewOrBoolean(executableElement, valid);
55+
validatorHelper.param.anyOrder() //
56+
.type(CanonicalNameConstants.VIEW).optional() //
57+
.primitiveOrWrapper(TypeKind.BOOLEAN).optional() //
58+
.validate(executableElement, valid);
6059
}
6160

6261
@Override

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ItemClickHandler.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
import org.androidannotations.annotations.ItemClick;
3131
import org.androidannotations.helper.APTCodeModelHelper;
32-
import org.androidannotations.helper.CanonicalNameConstants;
3332
import org.androidannotations.holder.EComponentWithViewSupportHolder;
3433
import org.androidannotations.model.AnnotationElements;
3534
import org.androidannotations.process.IsValid;
@@ -58,12 +57,7 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
5857

5958
validatorHelper.returnTypeIsVoid(executableElement, valid);
6059

61-
validatorHelper.param.inOrder().extendsType(CanonicalNameConstants.ADAPTER_VIEW).optional() //
62-
.anyType().optional() //
63-
.extendsType(CanonicalNameConstants.VIEW).optional() //
64-
.type(int.class.getName()).optional() //
65-
.type(long.class.getName()).optional() //
66-
.validate(executableElement, valid);
60+
validatorHelper.param.anyType().optional().validate(executableElement, valid);
6761
}
6862

6963
@Override

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ItemLongClickHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
5858

5959
validatorHelper.returnTypeIsVoidOrBoolean(executableElement, valid);
6060

61-
validatorHelper.param.zeroOrOneParameter(executableElement, valid);
61+
validatorHelper.param.anyType().optional().validate(executableElement, valid);
6262
}
6363

6464
@Override

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/ItemSelectHandler.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
5959

6060
validatorHelper.returnTypeIsVoid(executableElement, valid);
6161

62-
validatorHelper.param.hasOneOrTwoParametersAndFirstIsBoolean(executableElement, valid);
62+
validatorHelper.param.inOrder() //
63+
.primitiveOrWrapper(TypeKind.BOOLEAN) //
64+
.anyType().optional() //
65+
.validate(executableElement, valid);
6366
}
6467

6568
@Override

0 commit comments

Comments
 (0)