diff options
| author | Eugene Susla <eugenesusla@google.com> | 2019-10-16 10:12:47 -0700 |
|---|---|---|
| committer | Eugene Susla <eugenesusla@google.com> | 2019-10-16 14:29:58 -0700 |
| commit | 1bfb5e709728959eb77cb756a2db80ecdc7549e1 (patch) | |
| tree | b950e66f914f83fc593e92e514560eb45571d7c6 /tools/codegen/src | |
| parent | 8357dd73aedddbeefaa0fcafe7b55749f0efbc33 (diff) | |
Add @NonNull to some generated methods' args
Test: . frameworks/base/tests/Codegen/runTest.sh
Fixes: 142783758
Change-Id: I7303d420efd59389c324b3e399fcb3532b5d6c37
Diffstat (limited to 'tools/codegen/src')
| -rw-r--r-- | tools/codegen/src/com/android/codegen/Generators.kt | 12 | ||||
| -rw-r--r-- | tools/codegen/src/com/android/codegen/SharedConstants.kt | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/codegen/src/com/android/codegen/Generators.kt b/tools/codegen/src/com/android/codegen/Generators.kt index 0ebb3cf2a447..431f378a8811 100644 --- a/tools/codegen/src/com/android/codegen/Generators.kt +++ b/tools/codegen/src/com/android/codegen/Generators.kt @@ -417,7 +417,7 @@ fun ClassPrinter.generateParcelable() { if (!isMethodGenerationSuppressed("writeToParcel", Parcel, "int")) { +"@Override" +GENERATED_MEMBER_HEADER - "public void writeToParcel($Parcel dest, int flags)" { + "public void writeToParcel(@$NonNull $Parcel dest, int flags)" { +"// You can override field parcelling by defining methods like:" +"// void parcelFieldName(Parcel dest, int flags) { ... }" +"" @@ -473,7 +473,7 @@ fun ClassPrinter.generateParcelable() { +"/** @hide */" +"@SuppressWarnings({\"unchecked\", \"RedundantCast\"})" +GENERATED_MEMBER_HEADER - "$visibility $ClassName($Parcel in) {" { + "$visibility $ClassName(@$NonNull $Parcel in) {" { +"// You can override field unparcelling by defining methods like:" +"// static FieldType unparcelFieldName(Parcel in) { ... }" +"" @@ -598,7 +598,7 @@ fun ClassPrinter.generateParcelable() { } +"@Override" - "public $ClassName createFromParcel($Parcel in)" { + "public $ClassName createFromParcel(@$NonNull $Parcel in)" { +"return new $ClassName(in);" } rmEmptyLine() @@ -611,7 +611,7 @@ fun ClassPrinter.generateEqualsHashcode() { if (!isMethodGenerationSuppressed("equals", "Object")) { +"@Override" +GENERATED_MEMBER_HEADER - "public boolean equals(Object o)" { + "public boolean equals(@$Nullable Object o)" { +"// You can override field equality logic by defining either of the methods like:" +"// boolean fieldNameEquals($ClassName other) { ... }" +"// boolean fieldNameEquals(FieldType otherValue) { ... }" @@ -904,7 +904,7 @@ fun ClassPrinter.generateForEachField() { usedSpecializationsSet.toList().forEachLastAware { specType, isLast -> val SpecType = specType.capitalize() val ActionClass = classRef("com.android.internal.util.DataClass.Per${SpecType}FieldAction") - +"$ActionClass<$ClassType> action$SpecType${if_(!isLast, ",")}" + +"@$NonNull $ActionClass<$ClassType> action$SpecType${if_(!isLast, ",")}" } }; " {" { usedSpecializations.forEachIndexed { i, specType -> @@ -919,7 +919,7 @@ fun ClassPrinter.generateForEachField() { +"/** @deprecated May cause boxing allocations - use with caution! */" +"@Deprecated" +GENERATED_MEMBER_HEADER - "void forEachField($PerObjectFieldAction<$ClassType> action)" { + "void forEachField(@$NonNull $PerObjectFieldAction<$ClassType> action)" { fields.forEachApply { +"action.acceptObject(this, \"$nameLowerCamel\", $name);" } diff --git a/tools/codegen/src/com/android/codegen/SharedConstants.kt b/tools/codegen/src/com/android/codegen/SharedConstants.kt index 8c4583f68c4b..3eb9e7bb68c6 100644 --- a/tools/codegen/src/com/android/codegen/SharedConstants.kt +++ b/tools/codegen/src/com/android/codegen/SharedConstants.kt @@ -1,7 +1,7 @@ package com.android.codegen const val CODEGEN_NAME = "codegen" -const val CODEGEN_VERSION = "1.0.8" +const val CODEGEN_VERSION = "1.0.9" const val CANONICAL_BUILDER_CLASS = "Builder" const val BASE_BUILDER_CLASS = "BaseBuilder" |