refactor: improve api for compiler

Author: rcasia

lua/neotest-java/core/spec_builder/compiler/init.lua

@@ -1,5 +1,21 @@
+local jdtls_compiler = require("neotest-java.core.spec_builder.compiler.jdtls")
+
+---@class NeotestJavaCompiler.Opts
+---@field cwd string
+---@field classpath_file_dir string
+---@field compile_mode string
+
+--- Interface for Java compilers
+---@class NeotestJavaCompiler
+local NeotestJavaCompiler = {}
+
+---@param opts NeotestJavaCompiler.Opts
+---@return string classpath_file_arg
+function NeotestJavaCompiler.compile(opts) end
+
+---@type table<string, NeotestJavaCompiler>
 local compilers = {
-	jdtls = require("neotest-java.core.spec_builder.compiler.jdtls"),
+	jdtls = jdtls_compiler,
 }
 
 return compilers

lua/neotest-java/core/spec_builder/compiler/jdtls.lua

@@ -3,35 +3,31 @@ local nio = require("nio")
 local _jdtls = require("neotest-java.command.jdtls")
 local scan = require("plenary.scandir")
 
----@class NeotestJava.compilerOpts
----@field cwd string
----@field classpath_file_dir string
----@field compile_mode string
+---@type NeotestJavaCompiler
+local jdtls_compiler = {
+	compile = function(args)
+		-- check that required dependencies are present
+		local ok_jdtls, jdtls = pcall(require, "jdtls")
+		assert(ok_jdtls, "neotest-java requires nvim-jdtls to tests")
 
----@param args NeotestJava.compilerOpts
----@return string classpath_file_arg
-local function compile(args)
-	-- check that required dependencies are present
-	local ok_jdtls, jdtls = pcall(require, "jdtls")
-	assert(ok_jdtls, "neotest-java requires nvim-jdtls to tests")
+		-- check there is an active java client
+		local has_jdtls_client = #nio.lsp.get_clients({ name = "jdtls" }) ~= 0
+		assert(has_jdtls_client, "there is no jdtls client attached.")
 
-	-- check there is an active java client
-	local has_jdtls_client = #nio.lsp.get_clients({ name = "jdtls" }) ~= 0
-	assert(has_jdtls_client, "there is no jdtls client attached.")
+		logger.debug(("compilation in %s mode"):format(args.compile_mode))
+		nio.run(function(_)
+			nio.scheduler()
+			jdtls.compile(args.compile_mode)
+		end):wait()
+		logger.debug("compilation complete!")
 
-	logger.debug(("compilation in %s mode"):format(args.compile_mode))
-	nio.run(function(_)
-		nio.scheduler()
-		jdtls.compile(args.compile_mode)
-	end):wait()
-	logger.debug("compilation complete!")
+		local resources = scan.scan_dir(args.cwd, {
+			only_dirs = true,
+			search_pattern = "test/resources$",
+		})
 
-	local resources = scan.scan_dir(args.cwd, {
-		only_dirs = true,
-		search_pattern = "test/resources$",
-	})
+		return _jdtls.get_classpath_file_argument(args.classpath_file_dir, resources)
+	end,
+}
 
-	return _jdtls.get_classpath_file_argument(args.classpath_file_dir, resources)
-end
-
-return compile
+return jdtls_compiler

lua/neotest-java/core/spec_builder/init.lua

@@ -16,7 +16,7 @@ local compatible_path = require("neotest-java.util.compatible_path")
 local Project = require("neotest-java.types.project")
 local ch = require("neotest-java.context_holder")
 local find_module_by_filepath = require("neotest-java.util.find_module_by_filepath")
-local compiler = require("neotest-java.core.spec_builder.compiler")
+local compilers = require("neotest-java.core.spec_builder.compiler")
 
 local SpecBuilder = {}
 
@@ -98,11 +98,8 @@ function SpecBuilder.build_spec(args, project_type, config)
     end
 	logger.debug("building complete!")
 
-    local resources = scan.scan_dir(base_dir, {
-        only_dirs = true,
-        search_pattern = "test/resources$",
-    })
-    local classpath_file_arg = _jdtls.get_classpath_file_argument(reports_dir, resources)
+    local classpath_file_arg =
+    compilers.jdtls.compile({ cwd = base_dir, classpath_file_dir = output_dir, compile_mode = build_mode })
 	-- local classpath_file_arg = compile(compile_mode)
 	command:classpath_file_arg(classpath_file_arg)