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

CORDA-539 - Code Cleanup

Browse Source 
Applying IntelliJ's white space reformat as no doubt I didn't follow the
coding convention too closely.

Remove some IntelliJ warnings
This commit is contained in:
Katelyn Baker
2017-09-11 12:51:48 +01:00
parent c48a37a080
commit 063771fac4
6 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,7 +419,8 @@ class ClassCarpenter(cl: ClassLoader = Thread.currentThread().contextClassLoader
} }
companion object { companion object {
@JvmStatic @Suppress("UNUSED") @JvmStatic
@Suppress("UNUSED")
fun getField(obj: Any, name: String): Any? = obj.javaClass.getMethod("get" + name.capitalize()).invoke(obj) fun getField(obj: Any, name: String): Any? = obj.javaClass.getMethod("get" + name.capitalize()).invoke(obj)
} }
} }

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

@ -28,16 +28,13 @@ data class CarpenterSchemas (
val dependsOn: MutableMap<String, MutableList<String>>) { val dependsOn: MutableMap<String, MutableList<String>>) {
companion object CarpenterSchemaConstructor { companion object CarpenterSchemaConstructor {
fun newInstance(): CarpenterSchemas { fun newInstance(): CarpenterSchemas {
return CarpenterSchemas( return CarpenterSchemas(mutableListOf(), mutableMapOf(), mutableMapOf())
mutableListOf<Schema>(),
mutableMapOf<String, Pair<TypeNotation, MutableList<String>>>(),
mutableMapOf<String, MutableList<String>>())
} }
} }
fun addDepPair(type: TypeNotation, dependant: String, dependee: String) { fun addDepPair(type: TypeNotation, dependant: String, dependee: String) {
dependsOn.computeIfAbsent(dependee, { mutableListOf<String>() }).add(dependant) dependsOn.computeIfAbsent(dependee, { mutableListOf() }).add(dependant)
dependencies.computeIfAbsent(dependant, { Pair(type, mutableListOf<String>()) }).second.add(dependee) dependencies.computeIfAbsent(dependant, { Pair(type, mutableListOf()) }).second.add(dependee)
} }
val size val size
@ -71,7 +68,7 @@ abstract class MetaCarpenterBase (val schemas : CarpenterSchemas, val cc : Class
schemas.dependencies[dependent]?.second?.remove(newObject.name) schemas.dependencies[dependent]?.second?.remove(newObject.name)
// we're out of blockers so we can now create the type // we're out of blockers so we can now create the type
if (schemas.dependencies[dependent]?.second?.isEmpty() ?: false) { if (schemas.dependencies[dependent]?.second?.isEmpty() == true) {
(schemas.dependencies.remove(dependent)?.first as CompositeType).carpenterSchema( (schemas.dependencies.remove(dependent)?.first as CompositeType).carpenterSchema(
classloader = cc.classloader, classloader = cc.classloader,
carpenterSchemas = schemas) carpenterSchemas = schemas)

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

@ -17,8 +17,7 @@ abstract class Schema(
var fields: Map<String, Field>, var fields: Map<String, Field>,
val superclass: Schema? = null, val superclass: Schema? = null,
val interfaces: List<Class<*>> = emptyList(), val interfaces: List<Class<*>> = emptyList(),
updater : (String, Field) -> Unit) updater: (String, Field) -> Unit) {
{
private fun Map<String, Field>.descriptors() = LinkedHashMap(this.mapValues { it.value.descriptor }) private fun Map<String, Field>.descriptors() = LinkedHashMap(this.mapValues { it.value.descriptor })
init { init {