Work toward alignment with Python implementation

See also apposed/appose-python@bd7b13f.

Author: ctrueden

src/main/java/org/apposed/appose/Builder.java

@@ -204,31 +204,31 @@ default T channels(String... channels) {
 	T channels(List<String> channels);
 
 	/**
-	 * Specifies a configuration file to build from.
+	 * Specifies a configuration file path to build from.
 	 * Reads the file content immediately and delegates to {@link #content(String)}.
 	 *
-	 * @param file Configuration file (e.g., pixi.toml, environment.yml)
+	 * @param path Path to configuration file (e.g., "pixi.toml", "environment.yml")
 	 * @return This builder instance, for fluent-style programming.
-	 * @throws BuildException If the file cannot be read
+	 * @throws BuildException If the file cannot be read or is invalid
 	 */
-	default T file(File file) throws BuildException {
-		return file(file.getAbsolutePath());
+	default T file(String path) throws BuildException {
+		return file(new File(path));
 	}
 
 	/**
-	 * Specifies a configuration file path to build from.
+	 * Specifies a configuration file to build from.
 	 * Reads the file content immediately and delegates to {@link #content(String)}.
 	 *
-	 * @param path Path to configuration file (e.g., "pixi.toml", "environment.yml")
+	 * @param file Configuration file (e.g., pixi.toml, environment.yml)
 	 * @return This builder instance, for fluent-style programming.
-	 * @throws BuildException If the file cannot be read or is invalid
+	 * @throws BuildException If the file cannot be read
 	 */
-	default T file(String path) throws BuildException {
+	default T file(File file) throws BuildException {
 		try {
-			Path filePath = Paths.get(path);
+			Path filePath = file.toPath();
 			String fileContent = new String(
-					Files.readAllBytes(filePath),
-					StandardCharsets.UTF_8
+				Files.readAllBytes(filePath),
+				StandardCharsets.UTF_8
 			);
 			return content(fileContent);
 		}
@@ -237,6 +237,23 @@ default T file(String path) throws BuildException {
 		}
 	}
 
+	/**
+	 * Specifies a URL to fetch configuration content from.
+	 * Reads the URL content immediately and delegates to {@link #content(String)}.
+	 *
+	 * @param path URL path of configuration file
+	 * @return This builder instance, for fluent-style programming.
+	 * @throws BuildException If the URL cannot be read or is invalid
+	 */
+	default T url(String path) throws BuildException {
+		try {
+			return url(new URL(path));
+		}
+		catch (MalformedURLException e) {
+			throw new BuildException(this, e);
+		}
+	}
+
 	/**
 	 * Specifies a URL to fetch configuration content from.
 	 * Reads the URL content immediately and delegates to {@link #content(String)}.
@@ -260,23 +277,6 @@ default T url(URL url) throws BuildException {
 		}
 	}
 
-	/**
-	 * Specifies a URL to fetch configuration content from.
-	 * Reads the URL content immediately and delegates to {@link #content(String)}.
-	 *
-	 * @param path URL path of configuration file
-	 * @return This builder instance, for fluent-style programming.
-	 * @throws BuildException If the URL cannot be read or is invalid
-	 */
-	default T url(String path) throws BuildException {
-		try {
-			return url(new URL(path));
-		}
-		catch (MalformedURLException e) {
-			throw new BuildException(this, e);
-		}
-	}
-
 	/**
 	 * Specifies configuration file content to build from.
 	 * The scheme will be auto-detected from content syntax.

src/main/java/org/apposed/appose/TaskException.java

@@ -42,37 +42,10 @@
  */
 public class TaskException extends Exception {
 
-	private final Task task;
+	public final Task task;
 
 	public TaskException(String message, Task task) {
 		super(message);
 		this.task = task;
 	}
-
-	/**
-	 * Returns the task that failed.
-	 *
-	 * @return The task associated with this exception.
-	 */
-	public Task getTask() {
-		return task;
-	}
-
-	/**
-	 * Returns the status of the failed task.
-	 *
-	 * @return The task's status (FAILED, CANCELED, or CRASHED).
-	 */
-	public TaskStatus getStatus() {
-		return task.status;
-	}
-
-	/**
-	 * Returns the error message from the task, if available.
-	 *
-	 * @return The task's error message, or null if none was set.
-	 */
-	public @Nullable String getTaskError() {
-		return task.error;
-	}
 }

src/main/java/org/apposed/appose/builder/BaseBuilder.java

@@ -55,12 +55,12 @@
  */
 public abstract class BaseBuilder<T extends BaseBuilder<T>> implements Builder<T> {
 
-	public final List<ProgressConsumer> progressSubscribers = new ArrayList<>();
-	public final List<Consumer<String>> outputSubscribers = new ArrayList<>();
-	public final List<Consumer<String>> errorSubscribers = new ArrayList<>();
-	public final Map<String, String> envVars = new HashMap<>();
-	public final List<String> channels = new ArrayList<>();
-	public final List<String> flags = new ArrayList<>();
+	protected final List<ProgressConsumer> progressSubscribers = new ArrayList<>();
+	protected final List<Consumer<String>> outputSubscribers = new ArrayList<>();
+	protected final List<Consumer<String>> errorSubscribers = new ArrayList<>();
+	protected final Map<String, String> envVars = new HashMap<>();
+	protected final List<String> channels = new ArrayList<>();
+	protected final List<String> flags = new ArrayList<>();
 	protected String envName;
 	protected File envDir;
 

src/main/java/org/apposed/appose/builder/MambaBuilder.java

@@ -57,17 +57,6 @@ public String envType() {
 		return "mamba";
 	}
 
-	/**
-	 * Adds conda channels to search for packages.
-	 *
-	 * @param channels Channel names (e.g., "conda-forge", "bioconda")
-	 * @return This builder instance, for fluent-style programming.
-	 */
-	@Override
-	public MambaBuilder channels(String... channels) {
-		return super.channels(channels);
-	}
-
 	@Override
 	public Environment build() throws BuildException {
 		File envDir = resolveEnvDir();
@@ -80,11 +69,14 @@ public Environment build() throws BuildException {
 			throw new BuildException(this, "Cannot use MambaBuilder: environment already managed by uv/venv at " + envDir);
 		}
 
+		// Create Mamba tool instance early so it's available for wrapping.
+		Mamba mamba = new Mamba();
+
 		// Is this envDir an already-existing conda directory?
 		boolean isCondaDir = new File(envDir, "conda-meta").isDirectory();
 		if (isCondaDir) {
 			// Environment already exists, just wrap it.
-			return createEnvironment(envDir);
+			return createEnvironment(mamba, envDir);
 		}
 
 		// Building a new environment - config content is required.
@@ -99,8 +91,6 @@ public Environment build() throws BuildException {
 			throw new IllegalArgumentException("MambaBuilder only supports environment.yml scheme, got: " + scheme);
 		}
 
-		Mamba mamba = new Mamba();
-
 		// Set up progress/output consumers.
 		mamba.setOutputConsumer(msg -> outputSubscribers.forEach(sub -> sub.accept(msg)));
 		mamba.setErrorConsumer(msg -> errorSubscribers.forEach(sub -> sub.accept(msg)));
@@ -133,7 +123,7 @@ public Environment build() throws BuildException {
 			// Step 3: Update environment from yml.
 			mamba.update(envDir, envYaml);
 
-			return createEnvironment(envDir);
+			return createEnvironment(mamba, envDir);
 		}
 		catch (IOException | InterruptedException e) {
 			throw new BuildException(this, e);
@@ -161,8 +151,7 @@ public Environment wrap(File envDir) throws BuildException {
 		return build();
 	}
 
-	private Environment createEnvironment(File envDir) {
-		Mamba mamba = new Mamba();
+	private Environment createEnvironment(Mamba mamba, File envDir) {
 		String base = envDir.getAbsolutePath();
 		List<String> launchArgs = Arrays.asList(mamba.command, "run", "-p", base);
 		List<String> binPaths = Collections.singletonList(envDir.toPath().resolve("bin").toString());

src/main/java/org/apposed/appose/builder/PixiBuilder.java

@@ -246,17 +246,6 @@ public Environment wrap(File envDir) throws BuildException {
 		return build();
 	}
 
-	/**
-	 * Adds conda channels to search for packages.
-	 *
-	 * @param channels Channel names (e.g.: {@code "conda-forge", "bioconda"})
-	 * @return This builder instance, for fluent-style programming.
-	 */
-	@Override
-	public PixiBuilder channels(String... channels) {
-		return super.channels(channels);
-	}
-
 	// -- Helper methods --
 
 	private Environment createEnvironment(Pixi pixi, File envDir) {

src/main/java/org/apposed/appose/builder/UvBuilder.java

@@ -222,18 +222,6 @@ public Environment wrap(File envDir) throws BuildException {
 		return build();
 	}
 
-	/**
-	 * Adds PyPI index URLs for package discovery.
-	 * These are alternative or additional package indexes beyond the default pypi.org.
-	 *
-	 * @param indexes Index URLs (e.g., custom PyPI mirrors or private package repositories)
-	 * @return This builder instance, for fluent-style programming.
-	 */
-	@Override
-	public UvBuilder channels(String... indexes) {
-		return super.channels(indexes);
-	}
-
 	// -- Helper methods --
 
 	private Environment createEnvironment(File envDir) {

src/test/java/org/apposed/appose/DumpApi.java

@@ -73,6 +73,7 @@ public class DumpApi {
 		// Core API classes.
 		PACKAGE_TO_MODULE.put("org.apposed.appose.Appose", "appose/__init__.api");
 		PACKAGE_TO_MODULE.put("org.apposed.appose.Environment", "appose/environment.api");
+		PACKAGE_TO_MODULE.put("org.apposed.appose.TaskException", "appose/service.api");
 		PACKAGE_TO_MODULE.put("org.apposed.appose.Service", "appose/service.api");
 		PACKAGE_TO_MODULE.put("org.apposed.appose.Service.Task", "appose/service.api");
 		PACKAGE_TO_MODULE.put("org.apposed.appose.Service.TaskStatus", "appose/service.api");
@@ -86,7 +87,11 @@ public class DumpApi {
 		PACKAGE_TO_MODULE.put("org.apposed.appose.SharedMemory", "appose/shm.api");
 
 		// Subsystem packages - all classes in package go to same file.
-		PACKAGE_TO_MODULE.put("org.apposed.appose.scheme", "appose/scheme.api");
+		PACKAGE_TO_MODULE.put("org.apposed.appose.Scheme", "appose/scheme.api");
+		PACKAGE_TO_MODULE.put("org.apposed.appose.scheme.PixiTomlScheme", "appose/scheme.api");
+		PACKAGE_TO_MODULE.put("org.apposed.appose.scheme.EnvironmentYmlScheme", "appose/scheme.api");
+		PACKAGE_TO_MODULE.put("org.apposed.appose.scheme.PyProjectTomlScheme", "appose/scheme.api");
+		PACKAGE_TO_MODULE.put("org.apposed.appose.scheme.RequirementsTxtScheme", "appose/scheme.api");
 		PACKAGE_TO_MODULE.put("org.apposed.appose.scheme.Schemes", "appose/scheme.api");
 		PACKAGE_TO_MODULE.put("org.apposed.appose.shm.Shms", "appose/shm.api");
 		PACKAGE_TO_MODULE.put("org.apposed.appose.syntax", "appose/syntax.api");

src/test/java/org/apposed/appose/TaskExceptionTest.java

@@ -63,10 +63,10 @@ public void testTaskExceptionOnFailure() throws Exception {
 				assertTrue(e.getMessage().contains("NameError"));
 
 				// Verify we can access the task and its details through the exception.
-				assertSame(task, e.getTask());
-				assertEquals(TaskStatus.FAILED, e.getStatus());
-				assertNotNull(e.getTaskError());
-				assertTrue(e.getTaskError().contains("NameError"));
+				assertSame(task, e.task);
+				assertEquals(TaskStatus.FAILED, e.task.status);
+				assertNotNull(e.task.error);
+				assertTrue(e.task.error.contains("NameError"));
 			}
 		}
 	}