Port JavaModule to NewExtensionModule API

1 files changed, 25 insertions, 18 deletions

diff --git a/mesonbuild/modules/java.py b/mesonbuild/modules/java.py
index 9d325c7..6884a22 100644
--- a/mesonbuild/modules/java.py
+++ b/mesonbuild/modules/java.py
@@ -17,65 +17,70 @@ import pathlib
 import typing as T
 from mesonbuild import mesonlib
 from mesonbuild.build import CustomTarget
-from mesonbuild.compilers import detect_compiler_for
+from mesonbuild.compilers import detect_compiler_for, Compiler
+from mesonbuild.interpreter import Interpreter
 from mesonbuild.interpreterbase.decorators import ContainerTypeInfo, FeatureDeprecated, FeatureNew, KwargInfo, typed_pos_args, typed_kwargs
 from mesonbuild.mesonlib import version_compare, MachineChoice
-from . import ExtensionModule, ModuleReturnValue, ModuleState
-from ..interpreter import Interpreter
+from . import NewExtensionModule, ModuleReturnValue, ModuleState
 
-class JavaModule(ExtensionModule):
+class JavaModule(NewExtensionModule):
     @FeatureNew('Java Module', '0.60.0')
     def __init__(self, interpreter: Interpreter):
-        super().__init__(interpreter)
+        super().__init__()
         self.methods.update({
             'generate_native_header': self.generate_native_header,
             'generate_native_headers': self.generate_native_headers,
         })
 
-        if 'java' not in interpreter.environment.coredata.compilers[MachineChoice.BUILD]:
-            detect_compiler_for(interpreter.environment, 'java', MachineChoice.BUILD)
-        self.javac = interpreter.environment.coredata.compilers[MachineChoice.BUILD]['java']
+    def __get_java_compiler(self, state: ModuleState) -> Compiler:
+        if 'java' not in state.environment.coredata.compilers[MachineChoice.BUILD]:
+            detect_compiler_for(state.environment, 'java', MachineChoice.BUILD)
+        return state.environment.coredata.compilers[MachineChoice.BUILD]['java']
 
     @FeatureDeprecated('java.generate_native_header', '0.62.0', 'Use java.generate_native_headers instead')
     @typed_pos_args('java.generate_native_header', (str, mesonlib.File))
     @typed_kwargs('java.generate_native_header', KwargInfo('package', str, default=None))
-    def generate_native_header(self, state: ModuleState, args: T.Tuple[T.Union[str, FileHolder]],
+    def generate_native_header(self, state: ModuleState, args: T.Tuple[T.Union[str, mesonlib.File]],
                                kwargs: T.Dict[str, T.Optional[str]]) -> ModuleReturnValue:
         package = kwargs.get('package')
 
-        file = self.interpreter.source_strings_to_files(
-            [a.held_object if isinstance(a, FileHolder) else a for a in args])[0]
+        if isinstance(args[0], mesonlib.File):
+            file = args[0]
+        else:
+            file = mesonlib.File.from_source_file(state.source_root, state.subdir, args[0])
 
         if package:
             header = f'{package.replace(".", "_")}_{pathlib.Path(file.fname).stem}.h'
         else:
             header = f'{pathlib.Path(file.fname).stem}.h'
 
+        javac = self.__get_java_compiler(state)
+
         target = CustomTarget(
             os.path.basename(header),
             state.subdir,
             state.subproject,
-            [
-                self.javac.exelist[0],
+            mesonlib.listify([
+                javac.exelist,
                 '-d',
                 '@PRIVATE_DIR@',
                 '-h',
                 state.subdir,
                 '@INPUT@',
-            ],
+            ]),
             [file],
             [header],
             backend=state.backend,
         )
         # It is only known that 1.8.0 won't pre-create the directory. 11 and 16
         # do not exhibit this behavior.
-        if version_compare(self.javac.version, '1.8.0'):
+        if version_compare(javac.version, '1.8.0'):
             pathlib.Path(state.backend.get_target_private_dir_abs(target)).mkdir(parents=True, exist_ok=True)
 
         return ModuleReturnValue(target, [target])
 
     @FeatureNew('java.generate_native_headers', '0.62.0')
-    @typed_pos_args('generate_native_headers', (str, mesonlib.File), min_varargs=1)
+    @typed_pos_args('java.generate_native_headers', (str, mesonlib.File), min_varargs=1)
     @typed_kwargs('java.generate_native_headers',
         KwargInfo('classes', (ContainerTypeInfo(list, str)), default=[], listify=True,
             required=True),
@@ -93,8 +98,10 @@ class JavaModule(ExtensionModule):
             else:
                 headers.append(f'{underscore_clazz}.h')
 
+        javac = self.__get_java_compiler(state)
+
         command = mesonlib.listify([
-            self.javac.exelist,
+            javac.exelist,
             '-d',
             '@PRIVATE_DIR@',
             '-h',
@@ -109,7 +116,7 @@ class JavaModule(ExtensionModule):
 
         # It is only known that 1.8.0 won't pre-create the directory. 11 and 16
         # do not exhibit this behavior.
-        if version_compare(self.javac.version, '1.8.0'):
+        if version_compare(javac.version, '1.8.0'):
             pathlib.Path(state.backend.get_target_private_dir_abs(target)).mkdir(parents=True, exist_ok=True)
 
         return ModuleReturnValue(target, [target])