Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03ae92e5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update StaleDataclassProcessor for JDK 17" am: f9ce0a2c 

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

Change-Id: I9e3a59eb16ea0a525cdae306a11e7432334ed95a
parents 60bc7d68 f9ce0a2c

tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt

+8 −10
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import com.android.codegen.BASE_BUILDER_CLASS 
import com.android.codegen.CANONICAL_BUILDER_CLASS

import com.android.codegen.CODEGEN_NAME

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.FileNotFoundException

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.ElementKind

import javax.lang.model.element.TypeElement

import javax.lang.model.type.ExecutableType

import javax.tools.Diagnostic



private const val STALE_FILE_THRESHOLD_MS = 1000
@@ -102,14 +101,13 @@ class StaleDataclassProcessor: AbstractProcessor() { 
            append(" ")

            append(elem.annotationMirrors.joinToString(" ", transform = { annotationToString(it) }))

            append(" ")

            if (elem is Symbol) {

                if (elem.type is Type.MethodType) {

                    append((elem.type as Type.MethodType).returnType)

            val type = elem.asType()

            if (type is ExecutableType) {

                append(type.returnType)

            } else {

                    append(elem.type)

                append(type)

            }

            append(" ")

            }

            append(elem)

        }

    }