More speedup by reusing the parser buffer.

Author: nedtwigg

atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/PlugParser.kt

@@ -26,7 +26,7 @@ import org.objectweb.asm.Type
 class PlugParser {
 	private var buffer = ByteArray(64 * 1024)
 
-	fun parse(file: File) {
+	fun parse(file: File): Pair<String, String>? {
 		val filelen = (file.length() + 1).toInt() // +1 prevents infinite loop
 		if (buffer.size < filelen) {
 			buffer = ByteArray(filelen)
@@ -42,18 +42,17 @@ class PlugParser {
 			}
 		}
 		val reader = ClassReader(buffer, 0, pos)
-		plugClassName = asmToJava(reader.className)
+		val plugClassName = asmToJava(reader.className)
+		this.plugClassName = plugClassName
 		socketClassName = null
+		// set socketClassName if there is an `@Plug`
 		reader.accept(
 				classVisitor, ClassReader.SKIP_FRAMES or ClassReader.SKIP_DEBUG or ClassReader.SKIP_CODE)
+		return socketClassName?.let { plugClassName to it }
 	}
 
-	fun hasPlug(): Boolean {
-		return socketClassName != null
-	}
-
-	var plugClassName: String? = null
-	var socketClassName: String? = null
+	private var plugClassName: String? = null
+	private var socketClassName: String? = null
 
 	private val classVisitor: ClassVisitor =
 			object : ClassVisitor(API) {
@@ -73,7 +72,7 @@ class PlugParser {
 			}
 
 	companion object {
-		fun asmToJava(className: String): String {
+		private fun asmToJava(className: String): String {
 			return className.replace("/", ".")
 		}
 

atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/gradle/FindPlugsTask.kt

@@ -2,7 +2,6 @@ package com.diffplug.atplug.tooling.gradle
 
 import com.diffplug.atplug.tooling.PlugParser
 import java.io.File
-import java.nio.charset.StandardCharsets
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.DirectoryProperty
@@ -20,7 +19,7 @@ abstract class FindPlugsTask : DefaultTask() {
 	@get:InputFiles
 	abstract val classesFolders: ConfigurableFileCollection
 
-	/** Directory where we will store discovered plugs in .txt files, etc. */
+	/** Directory where we will store discovered plugs. */
 	@get:OutputDirectory abstract val discoveredPlugsDir: DirectoryProperty
 
 	@TaskAction
@@ -34,6 +33,7 @@ abstract class FindPlugsTask : DefaultTask() {
 		discoveredPlugsDir.get().asFile.mkdirs()
 
 		// For each changed file in classesFolders, determine if it has @Plug
+		val parser = PlugParser()
 		for (change in inputChanges.getFileChanges(classesFolders)) {
 			if (!change.file.name.endsWith(".class")) {
 				continue
@@ -45,21 +45,26 @@ abstract class FindPlugsTask : DefaultTask() {
 				}
 				ChangeType.ADDED,
 				ChangeType.MODIFIED -> {
-					parseAndWriteMetadata(change.file)
+					parseAndWriteMetadata(parser, change.file)
 				}
 			}
 		}
 	}
 
-	private fun parseAndWriteMetadata(classFile: File) {
-		val parser = PlugParser()
-		parser.parse(classFile)
-		if (parser.hasPlug()) {
+	private fun parseAndWriteMetadata(parser: PlugParser, classFile: File) {
+		val plugToSocket = parser.parse(classFile)
+		if (plugToSocket != null) {
 			// For example: write a single line containing the discovered plug FQN
-			val discoveredFile = discoveredPlugsDir.file(parser.plugClassName + ".txt").get().asFile
-			discoveredFile.parentFile.mkdirs()
-			discoveredFile.writeText(
-					parser.plugClassName!! + "|" + parser.socketClassName!!, StandardCharsets.UTF_8)
+			val discoveredFile = discoveredPlugsDir.file(classFile.nameWithoutExtension).get().asFile
+			if (discoveredFile.exists()) {
+				val existing = discoveredFile.readText().split("|")
+				check(existing[0] == plugToSocket.first) {
+					"You need to rename one of these plugs because they have the same classfile name: ${existing[0]} and $plugToSocket"
+				}
+			} else {
+				discoveredFile.parentFile.mkdirs()
+			}
+			discoveredFile.writeText(plugToSocket.let { "${it.first}|${it.second}" })
 		} else {
 			// If previously discovered, remove it
 			removeOldMetadata(classFile)
@@ -68,7 +73,7 @@ abstract class FindPlugsTask : DefaultTask() {
 
 	private fun removeOldMetadata(classFile: File) {
 		// Remove any discovered file for the old .class
-		val possibleName = classFile.nameWithoutExtension + ".txt"
+		val possibleName = classFile.nameWithoutExtension
 		val discoveredFile = discoveredPlugsDir.file(possibleName).get().asFile
 		if (discoveredFile.exists()) {
 			discoveredFile.delete()

atplug-plugin-gradle/src/main/java/com/diffplug/atplug/tooling/gradle/PlugGenerateTask.kt

@@ -73,34 +73,20 @@ abstract class PlugGenerateTask : DefaultTask() {
 
 	@TaskAction
 	fun build() {
-		// 1) Collect the discovered classes
-		val discoveredFiles =
-				discoveredPlugsDir.get().asFile.listFiles().orEmpty().filter {
-					it.isFile && it.name.endsWith(".txt")
+		val discoveredFiles = discoveredPlugsDir.get().asFile.listFiles().orEmpty().filter { it.isFile }
+		val plugsToSockets =
+				discoveredFiles.associate {
+					val pieces = it.readText().split("|")
+					pieces[0] to pieces[1]
 				}
-
-		// Turn them into a list of (plugClass, socketClass)
-		val discoveredPlugs =
-				discoveredFiles
-						.map { file ->
-							val line = file.readText(StandardCharsets.UTF_8).trim()
-							val split = line.split("|")
-							check(split.size == 2) { "Malformed discovered line in ${file.name}: '$line'" }
-							val (plugClassName, socketClassName) = split
-							plugClassName to socketClassName
-						}
-						.toMap()
-
-		// 2) Use reflection logic, now that we have jarsToLinkAgainst, to produce final metadata
-		//    This is where you'd adapt the old PlugGenerator invocation, but no scanning is needed
-		if (discoveredPlugs.isEmpty()) {
+		if (plugsToSockets.isEmpty()) {
 			// no discovered plugs
 			FileMisc.cleanDir(atplugInfFolder)
 			return
 		}
 
 		// generate the metadata
-		val result = generate(discoveredPlugs)
+		val result = generate(plugsToSockets)
 
 		// clean out the ATPLUG-INF folder, and put the map's content into the folder
 		FileMisc.cleanDir(atplugInfFolder)
@@ -110,8 +96,8 @@ abstract class PlugGenerateTask : DefaultTask() {
 		}
 
 		// the resources directory *needs* the Service-Component entry of the manifest to exist in order
-		// for tests to work
-		// so we'll get a manifest (empty if necessary, but preferably we'll load what already exists)
+		// for tests to work so we'll get a manifest (empty if necessary, but preferably we'll load what
+		// already exists)
 		val manifest = loadManifest()
 		val componentsCmd = atplugComponents(atplugInfFolder)
 		val componentsActual = manifest.mainAttributes.getValue(PlugPlugin.SERVICE_COMPONENT)