Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update StaleDataclassProcessor for JDK 17" am: f9ce0a2c2b am: 03ae92e5f3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007761

Change-Id: I61b618c2da21a65597e0b9b1d39d3751742f9be5
This commit is contained in:
Treehugger Robot
2022-03-09 08:08:14 +00:00
committed by Automerger Merge Worker
parent c5eb3e636e 03ae92e5f3
commit 415ef94f27
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt
View File

@@ -21,8 +21,6 @@ import com.android.codegen.BASE_BUILDER_CLASS
import com.android.codegen.CANONICAL_BUILDER_CLASS import com.android.codegen.CANONICAL_BUILDER_CLASS
import com.android.codegen.CODEGEN_NAME import com.android.codegen.CODEGEN_NAME
import com.android.codegen.CODEGEN_VERSION import com.android.codegen.CODEGEN_VERSION
import com.sun.tools.javac.code.Symbol
import com.sun.tools.javac.code.Type
import java.io.File import java.io.File
import java.io.FileNotFoundException import java.io.FileNotFoundException
import javax.annotation.processing.AbstractProcessor import javax.annotation.processing.AbstractProcessor
@@ -33,6 +31,7 @@ import javax.lang.model.element.AnnotationMirror
import javax.lang.model.element.Element import javax.lang.model.element.Element
import javax.lang.model.element.ElementKind import javax.lang.model.element.ElementKind
import javax.lang.model.element.TypeElement import javax.lang.model.element.TypeElement
import javax.lang.model.type.ExecutableType
import javax.tools.Diagnostic import javax.tools.Diagnostic
private const val STALE_FILE_THRESHOLD_MS = 1000 private const val STALE_FILE_THRESHOLD_MS = 1000
@@ -102,14 +101,13 @@ class StaleDataclassProcessor: AbstractProcessor() {
append(" ") append(" ")
append(elem.annotationMirrors.joinToString(" ", transform = { annotationToString(it) })) append(elem.annotationMirrors.joinToString(" ", transform = { annotationToString(it) }))
append(" ") append(" ")
if (elem is Symbol) { val type = elem.asType()
if (elem.type is Type.MethodType) { if (type is ExecutableType) {
append((elem.type as Type.MethodType).returnType) append(type.returnType)
} else { } else {
append(elem.type) append(type)
}
append(" ")
} }
append(" ")
append(elem) append(elem)
} }
} }
@@ -234,4 +232,4 @@ class StaleDataclassProcessor: AbstractProcessor() {
override fun getSupportedSourceVersion(): SourceVersion { override fun getSupportedSourceVersion(): SourceVersion {
return SourceVersion.latest() return SourceVersion.latest()
} }
} }