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

Small tidyup

Browse Source
This commit is contained in:
Katelyn Baker 2017-07-05 11:05:27 +01:00
parent 6dc7f694e4
commit 7d8d17ac08
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/kotlin/net/corda/core/serialization/carpenter/ClassCarpenter.kt
View File

@ -76,7 +76,7 @@ class ClassCarpenter {
class NullablePrimitive(msg: String) : RuntimeException(msg)
abstract class Field(val field: Class<out Any?>) {
val unsetName = "Unset"
protected val unsetName = "Unset"
var name: String = unsetName
abstract val nullabilityAnnotation: String
@ -96,8 +96,6 @@ class ClassCarpenter {
mv.visitAnnotation(nullabilityAnnotation, false)
}
abstract fun copy(name: String, field: Class<out Any?>): Field
abstract fun nullTest(mv: MethodVisitor, slot: Int)
fun visitParameter(mv: MethodVisitor, idx: Int) {
with(mv) {
visitParameter(name, 0)
@ -106,6 +104,9 @@ class ClassCarpenter {
}
}
}
abstract fun copy(name: String, field: Class<out Any?>): Field
abstract fun nullTest(mv: MethodVisitor, slot: Int)
}
class NonNullableField(field: Class<out Any?>) : Field(field) {
@ -341,9 +342,8 @@ class ClassCarpenter {
private fun ClassWriter.generateAbstractGetters(schema: Schema) {
for ((name, field) in schema.fields) {
val descriptor = field.descriptor
val opcodes = ACC_ABSTRACT + ACC_PUBLIC
with(visitMethod(opcodes, "get" + name.capitalize(), "()" + descriptor, null, null)) {
with(visitMethod(opcodes, "get" + name.capitalize(), "()${field.descriptor}", null, null)) {
// abstract method doesn't have any implementation so just end
visitEnd()
}
@ -378,7 +378,6 @@ class ClassCarpenter {
// Assign the fields from parameters.
var slot = 1 + superclassFields.size
for ((name, field) in schema.fields.entries) {
field.nullTest(this, slot)