ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-24 03:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Rename JarFilter's ClassTransformer to FilterTransformer. (#3481)

Browse Source
This commit is contained in:
Chris Rankin 2018-07-02 10:31:07 +01:00 committed by GitHub
parent 5d78992038
commit 64d65f0a54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/jarfilter/src/main/kotlin/net/corda/gradle/jarfilter/ClassTransformer.kt → buildSrc/jarfilter/src/main/kotlin/net/corda/gradle/jarfilter/FilterTransformer.kt
View File

@ -15,7 +15,7 @@ import org.objectweb.asm.Opcodes.*
* This Visitor is applied to the byte-code repeatedly until it has removed * This Visitor is applied to the byte-code repeatedly until it has removed
* everything that is no longer wanted. * everything that is no longer wanted.
*/ */
class ClassTransformer private constructor ( class FilterTransformer private constructor (
visitor: ClassVisitor, visitor: ClassVisitor,
logger: Logger, logger: Logger,
kotlinMetadata: MutableMap<String, List<String>>, kotlinMetadata: MutableMap<String, List<String>>,
@ -26,7 +26,7 @@ class ClassTransformer private constructor (
private val unwantedFields: MutableSet<FieldElement>, private val unwantedFields: MutableSet<FieldElement>,
private val deletedMethods: MutableSet<MethodElement>, private val deletedMethods: MutableSet<MethodElement>,
private val stubbedMethods: MutableSet<MethodElement> private val stubbedMethods: MutableSet<MethodElement>
) : KotlinAwareVisitor(ASM6, visitor, logger, kotlinMetadata), Repeatable<ClassTransformer> { ) : KotlinAwareVisitor(ASM6, visitor, logger, kotlinMetadata), Repeatable<FilterTransformer> {
constructor( constructor(
visitor: ClassVisitor, visitor: ClassVisitor,
logger: Logger, logger: Logger,
@ -62,7 +62,7 @@ class ClassTransformer private constructor (
name.startsWith("$className\$${method.visibleName}\$") name.startsWith("$className\$${method.visibleName}\$")
} }
override fun recreate(visitor: ClassVisitor) = ClassTransformer( override fun recreate(visitor: ClassVisitor) = FilterTransformer(
visitor = visitor, visitor = visitor,
logger = logger, logger = logger,
kotlinMetadata = kotlinMetadata, kotlinMetadata = kotlinMetadata,

2
buildSrc/jarfilter/src/main/kotlin/net/corda/gradle/jarfilter/JarFilterTask.kt
View File

@ -211,7 +211,7 @@ open class JarFilterTask : DefaultTask() {
private fun transform(inBytes: ByteArray): ByteArray { private fun transform(inBytes: ByteArray): ByteArray {
var reader = ClassReader(inBytes) var reader = ClassReader(inBytes)
var writer = ClassWriter(COMPUTE_MAXS) var writer = ClassWriter(COMPUTE_MAXS)
var transformer = ClassTransformer( var transformer = FilterTransformer(
visitor = writer, visitor = writer,
logger = logger, logger = logger,
removeAnnotations = toDescriptors(forRemove), removeAnnotations = toDescriptors(forRemove),

2
buildSrc/jarfilter/src/main/kotlin/net/corda/gradle/jarfilter/MetadataTransformer.kt
View File

@ -19,7 +19,7 @@ import java.io.InputStream
/** /**
* Base class for removing unwanted elements from [kotlin.Metadata] annotations. * Base class for removing unwanted elements from [kotlin.Metadata] annotations.
* This is used by [ClassTransformer] for [JarFilterTask]. * This is used by [FilterTransformer] for [JarFilterTask].
*/ */
internal abstract class MetadataTransformer<out T : MessageLite>( internal abstract class MetadataTransformer<out T : MessageLite>(
private val logger: Logger, private val logger: Logger,

2
buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/FieldRemovalTest.kt
View File

@ -46,7 +46,7 @@ class FieldRemovalTest {
private fun <T: R, R: Any> transform(type: Class<in T>, asType: Class<out R>): Class<out R> { private fun <T: R, R: Any> transform(type: Class<in T>, asType: Class<out R>): Class<out R> {
val bytecode = type.bytecode.execute({ writer -> val bytecode = type.bytecode.execute({ writer ->
ClassTransformer( FilterTransformer(
visitor = writer, visitor = writer,
logger = logger, logger = logger,
removeAnnotations = emptySet(), removeAnnotations = emptySet(),

2
buildSrc/jarfilter/src/test/kotlin/net/corda/gradle/jarfilter/StaticFieldRemovalTest.kt
View File

@ -28,7 +28,7 @@ class StaticFieldRemovalTest {
private fun <T : R, R : Any> transform(type: Class<in T>, asType: Class<out R>): Class<out R> { private fun <T : R, R : Any> transform(type: Class<in T>, asType: Class<out R>): Class<out R> {
val bytecode = type.bytecode.execute({ writer -> val bytecode = type.bytecode.execute({ writer ->
ClassTransformer( FilterTransformer(
visitor = writer, visitor = writer,
logger = logger, logger = logger,
removeAnnotations = emptySet(), removeAnnotations = emptySet(),