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

Replace Object with Any to fix Kotlin compiler warnings. (#1626)

Browse Source 
* Replace Object with Any to fix compiler warnings.

* Fix shadowed name warnings.
This commit is contained in:
Chris Rankin 2017-09-25 15:08:52 +01:00 committed by josecoll
parent 7c17bde3c8
commit 798f851def
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/DefaultWhitelist.kt
View File

@ -56,9 +56,9 @@ class DefaultWhitelist : CordaPluginRegistry() {
java.time.DayOfWeek::class.java, // No custom serialiser but it's an enum. java.time.DayOfWeek::class.java, // No custom serialiser but it's an enum.
java.time.Month::class.java, // No custom serialiser but it's an enum. java.time.Month::class.java, // No custom serialiser but it's an enum.
java.util.Collections.emptyMap<Object, Object>().javaClass, java.util.Collections.emptyMap<Any, Any>().javaClass,
java.util.Collections.emptySet<Object>().javaClass, java.util.Collections.emptySet<Any>().javaClass,
java.util.Collections.emptyList<Object>().javaClass, java.util.Collections.emptyList<Any>().javaClass,
java.util.LinkedHashMap::class.java, java.util.LinkedHashMap::class.java,
BitSet::class.java, BitSet::class.java,
OnErrorNotImplementedException::class.java, OnErrorNotImplementedException::class.java,

4
node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/carpenter/Schema.kt
View File

@ -51,7 +51,7 @@ class ClassSchema(
fields: Map<String, Field>, fields: Map<String, Field>,
superclass: Schema? = null, superclass: Schema? = null,
interfaces: List<Class<*>> = emptyList() interfaces: List<Class<*>> = emptyList()
) : Schema(name, fields, superclass, interfaces, { name, field -> field.name = name }) { ) : Schema(name, fields, superclass, interfaces, { newName, field -> field.name = newName }) {
override fun generateFields(cw: ClassWriter) { override fun generateFields(cw: ClassWriter) {
cw.apply { fields.forEach { it.value.generateField(this) } } cw.apply { fields.forEach { it.value.generateField(this) } }
} }
@ -66,7 +66,7 @@ class InterfaceSchema(
fields: Map<String, Field>, fields: Map<String, Field>,
superclass: Schema? = null, superclass: Schema? = null,
interfaces: List<Class<*>> = emptyList() interfaces: List<Class<*>> = emptyList()
) : Schema(name, fields, superclass, interfaces, { name, field -> field.name = name }) { ) : Schema(name, fields, superclass, interfaces, { newName, field -> field.name = newName }) {
override fun generateFields(cw: ClassWriter) { override fun generateFields(cw: ClassWriter) {
cw.apply { fields.forEach { it.value.generateField(this) } } cw.apply { fields.forEach { it.value.generateField(this) } }
} }