reorg pyterrier/java files to make more sense

terrier-org · Jul 31, 2024 · 9869fe3 · 9869fe3
1 parent 8b27581
commit 9869fe3
Show file tree

Hide file tree

Showing 9 changed files with 466 additions and 469 deletions.
diff --git a/pyterrier/__init__.py b/pyterrier/__init__.py
@@ -29,7 +29,7 @@
 # old name
 Utils = utils
 
-# will be set in terrier.java._post_init once java is loaded
+# will be set in terrier.terrier.java once java is loaded
 IndexRef = None
 
 

diff --git a/pyterrier/anserini/java.py b/pyterrier/anserini/java.py
@@ -5,7 +5,7 @@
 import pyterrier as pt
 
 
-configure = pt.java.config.register('pyterrier.anserini', {
+configure = pt.java.register_config('pyterrier.anserini', {
     'version': None,
 })
 

diff --git a/pyterrier/java/__init__.py b/pyterrier/java/__init__.py
@@ -1,8 +1,6 @@
 from pyterrier.java import mavenresolver
-from pyterrier.java._init import init, started, parallel_init, parallel_init_args, required, required_raise, before_init, autoclass, cast, legacy_init, JavaInitializer, CoreInit
-from pyterrier.java import config
-from pyterrier.java.config import configure
-from pyterrier.java.utils import redirect_stdouterr, bytebuffer_to_array, JavaClasses, J, add_jar, add_package, set_memory_limit, set_redirect_io, add_option, set_log_level
+from pyterrier.java.utils import JavaInitializer, init, started, parallel_init, parallel_init_args, required, required_raise, before_init, autoclass, cast, legacy_init, register_config, Configuration, JavaClasses
+from pyterrier.java.core import CoreInit, configure, redirect_stdouterr, bytebuffer_to_array, J, add_jar, add_package, set_memory_limit, set_redirect_io, add_option, set_log_level
 
 __all__ = [
     'add_jar', 'add_option', 'add_package', 'autoclass', 'before_init', 'bytebuffer_to_array', 'cast', 'config',

diff --git a/pyterrier/java/_init.py b/pyterrier/java/_init.py
diff --git a/pyterrier/java/config.py b/pyterrier/java/config.py