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

Commit 64d6f61d authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Minor fixes for XML persistence generation."

parents 6f883edd 785cd310

tools/xmlpersistence/src/main/kotlin/Generator.kt

+2 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ val FILE_HEADER = """ 
     */



    // Generated by xmlpersistence. DO NOT MODIFY!

    // CHECKSTYLE:OFF

    // CHECKSTYLE:OFF Generated code

    // @formatter:off

""".trimIndent() + "\n\n"
@@ -128,9 +128,7 @@ private fun generateReadMethod(rootField: ClassFieldInfo): MethodSpec = 
        .addAnnotation(nullableType)

        .addModifiers(Modifier.PUBLIC)

        .returns(rootField.type)

        .addControlFlow(

            "try (final \$1T inputStream = mFile.openRead())", FileInputStream::class.java

        ) {

        .addControlFlow("try (\$1T inputStream = mFile.openRead())", FileInputStream::class.java) {

            addStatement("final \$1T parser = \$2T.newPullParser()", xmlPullParserType, xmlType)

            addStatement("parser.setInput(inputStream, null)")

            addStatement("return parse(parser)")