PlugHarness and PlugInstanceMap now have KClass API.

Author: nedtwigg

atplug-runtime/src/main/java/com/diffplug/atplug/PlugInstanceMap.kt

@@ -6,6 +6,8 @@
  */
 package com.diffplug.atplug
 
+import kotlin.reflect.KClass
+
 class PlugInstanceMap {
 	internal val descriptorMap = mutableMapOf<String, MutableList<PlugDescriptor>>()
 	internal val instanceMap = mutableMapOf<PlugDescriptor, Any>()
@@ -15,10 +17,14 @@ class PlugInstanceMap {
 		descriptors.add(descriptor)
 	}
 
-	fun <T : Any> putInstance(clazz: Class<T>, descriptor: PlugDescriptor, instance: T) {
-		putDescriptor(clazz.name, descriptor)
+	fun <T : Any> putInstance(clazz: KClass<T>, descriptor: PlugDescriptor, instance: T) {
+		putDescriptor(clazz.qualifiedName!!, descriptor)
 		instanceMap[descriptor] = instance
 	}
 
+	fun <T : Any> putInstance(clazz: Class<T>, descriptor: PlugDescriptor, instance: T) {
+		putInstance(clazz.kotlin, descriptor, instance)
+	}
+
 	fun instanceFor(plugDescriptor: PlugDescriptor) = instanceMap[plugDescriptor]
 }

atplug-test-harness/src/main/java/com/diffplug/atplug/PlugHarness.kt

@@ -7,16 +7,19 @@
 package com.diffplug.atplug
 
 import java.lang.AutoCloseable
+import kotlin.reflect.KClass
 
 class PlugHarness {
 	var map = PlugInstanceMap()
 
-	fun <T : Any> add(clazz: Class<T>, instance: T): PlugHarness {
-		val descriptor = SocketOwner.metadataGeneratorFor(clazz).apply(instance)
+	fun <T : Any> add(clazz: KClass<T>, instance: T): PlugHarness {
+		val descriptor = SocketOwner.metadataGeneratorFor(clazz.java).apply(instance)
 		map.putInstance(clazz, PlugDescriptor.fromJson(descriptor), instance)
 		return this
 	}
 
+	fun <T : Any> add(clazz: Class<T>, instance: T): PlugHarness = add(clazz.kotlin, instance)
+
 	fun start(): AutoCloseable {
 		PlugRegistry.setHarness(map)
 		return AutoCloseable { PlugRegistry.setHarness(null) }