Merge branch 'development'

Author: intisy

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
         run: ./gradlew test --tests "io.github.intisy.docker.ModelTest" --tests "io.github.intisy.docker.DockerClientBuilderTest" --info
         shell: bash
 
-      - name: Run tests (Linux - excluding daemon startup tests)
+      - name: Run tests
         if: matrix.test-type == 'integration'
         run: ./gradlew test --tests "io.github.intisy.docker.ModelTest" --tests "io.github.intisy.docker.DockerClientBuilderTest" --tests "io.github.intisy.docker.WslDiagnosticTest" --info
         shell: bash
@@ -62,7 +62,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Run build with Gradle Wrapper (skip tests - already run in test job)
+      - name: Run build with Gradle Wrapper
         run: ./gradlew build -x test -Partifact_version=${{ github.ref_name }}
 
       - name: Create Release and Upload Jar

build.gradle

@@ -28,6 +28,7 @@ dependencies {
 
 test {
     useJUnitPlatform()
+    onlyIf { gradle.startParameter.taskNames.any { it == 'test' || it == ':test' } }
 }
 
 java {

src/main/java/io/github/intisy/docker/DockerClient.java

@@ -60,8 +60,6 @@ public static DockerClient createDefault() {
         }
     }
 
-    // ==================== Container Commands ====================
-
     public ListContainersCmd listContainers() {
         return new ListContainersCmd(httpClient);
     }
@@ -122,8 +120,6 @@ public ExecInspectCmd execInspect(String execId) {
         return new ExecInspectCmd(httpClient, execId);
     }
 
-    // ==================== Image Commands ====================
-
     public ListImagesCmd listImages() {
         return new ListImagesCmd(httpClient);
     }
@@ -148,8 +144,6 @@ public BuildImageCmd buildImage() {
         return new BuildImageCmd(httpClient);
     }
 
-    // ==================== Volume Commands ====================
-
     public ListVolumesCmd listVolumes() {
         return new ListVolumesCmd(httpClient);
     }
@@ -166,8 +160,6 @@ public InspectVolumeCmd inspectVolume(String volumeName) {
         return new InspectVolumeCmd(httpClient, volumeName);
     }
 
-    // ==================== Network Commands ====================
-
     public ListNetworksCmd listNetworks() {
         return new ListNetworksCmd(httpClient);
     }
@@ -192,8 +184,6 @@ public DisconnectNetworkCmd disconnectNetwork(String networkId) {
         return new DisconnectNetworkCmd(httpClient, networkId);
     }
 
-    // ==================== System Commands ====================
-
     public PingCmd ping() {
         return new PingCmd(httpClient);
     }

src/main/java/io/github/intisy/docker/DockerProvider.java

@@ -88,9 +88,6 @@ public static void resetBaseDirectory() {
     @Deprecated
     protected static final Path DOCKER_DIR = DEFAULT_DOCKER_DIR;
 
-    /**
-     * Get the appropriate DockerProvider for the current operating system.
-     */
     public static DockerProvider get() {
         String os = System.getProperty("os.name").toLowerCase();
         if (os.contains("win")) {
@@ -116,12 +113,20 @@ public static DockerProvider get() {
      * Start the Docker daemon.
      * This will always start a new managed Docker daemon instance.
      * The daemon will use isolated paths to avoid conflicts with Docker Desktop or other instances.
+     *
+     * @throws IOException if an I/O error occurs during startup
+     * @throws InterruptedException if the thread is interrupted during startup
+      * @throws IOException if an I/O error occurs during startup
+      * @throws InterruptedException if the thread is interrupted during startup
      */
     public abstract void start() throws IOException, InterruptedException;
 
     /**
      * Get a DockerClient for interacting with the Docker daemon.
      * The client can be used to manage containers, images, volumes, networks, etc.
+     *
+     * @return the DockerClient instance
+      * @return the DockerClient instance
      */
     public abstract DockerClient getClient();
 
@@ -134,6 +139,9 @@ public static DockerProvider get() {
     /**
      * Ensure Docker is installed.
      * Downloads and installs Docker if necessary.
+     *
+     * @throws IOException if an I/O error occurs during installation
+      * @throws IOException if an I/O error occurs during installation
      */
     public abstract void ensureInstalled() throws IOException;
 

src/main/java/io/github/intisy/docker/DockerVersionFetcher.java

@@ -11,8 +11,6 @@
 import java.net.URL;
 
 /**
- * Fetches the latest Docker version from GitHub.
- *
  * @author Finn Birich
  */
 public class DockerVersionFetcher {
@@ -49,9 +47,6 @@ public static String getLatestVersion() {
         return latestVersion;
     }
 
-    /**
-     * Reset the cached version (useful for testing).
-     */
     public static void resetCache() {
         latestVersion = null;
     }

src/main/java/io/github/intisy/docker/IOUtils.java

@@ -5,8 +5,6 @@
 import java.io.InputStream;
 
 /**
- * I/O utility methods for Java 8 compatibility.
- *
  * @author Finn Birich
  */
 final class IOUtils {

src/main/java/io/github/intisy/docker/MacDockerProvider.java

@@ -129,9 +129,6 @@ private boolean isLimaInstalled() {
         }
     }
 
-    /**
-     * Download and install Lima from GitHub releases.
-     */
     @SuppressWarnings("deprecation")
     private void downloadAndInstallLima() throws IOException {
         String arch = getArch();
@@ -182,9 +179,6 @@ private void downloadAndInstallLima() throws IOException {
         log.info("Lima {} installed successfully", LIMA_VERSION);
     }
 
-    /**
-     * Get the architecture string for Lima download.
-     */
     private String getArch() {
         String osArch = System.getProperty("os.arch");
         switch (osArch) {
@@ -219,9 +213,6 @@ public void start() throws IOException, InterruptedException {
         log.info("Docker daemon started in Lima VM (instance: {}, port: {})", instanceId, dockerPort);
     }
 
-    /**
-     * Create and start a Lima VM configured for Docker.
-     */
     private void createAndStartLimaVm() throws IOException, InterruptedException {
         String limactl = getLimactlPath();
 
@@ -270,9 +261,6 @@ private void createAndStartLimaVm() throws IOException, InterruptedException {
         ensureDockerRunning();
     }
 
-    /**
-     * Create Lima configuration YAML for Docker.
-     */
     private String createLimaConfig() {
         return String.format(
                 "# Lima VM configuration for docker-java\n" +
@@ -357,9 +345,6 @@ private void ensureDockerRunning() throws IOException, InterruptedException {
         }
     }
 
-    /**
-     * Run a Lima shell command in the VM.
-     */
     private String runLimaShellCommand(String command) throws IOException, InterruptedException {
         String limactl = getLimactlPath();
         ProcessBuilder pb = new ProcessBuilder(limactl, "shell", vmName, "bash", "-c", command);
@@ -370,9 +355,6 @@ private String runLimaShellCommand(String command) throws IOException, Interrupt
         return new String(output).trim();
     }
 
-    /**
-     * Run a limactl command.
-     */
     private String runLimaCommand(String... command) throws IOException, InterruptedException {
         ProcessBuilder pb = new ProcessBuilder(command);
         pb.redirectErrorStream(true);
@@ -382,9 +364,6 @@ private String runLimaCommand(String... command) throws IOException, Interrupted
         return new String(output).trim();
     }
 
-    /**
-     * Get Lima VM logs for debugging.
-     */
     private String getLimaLogs() {
         try {
             return runLimaShellCommand("sudo journalctl -u docker --no-pager -n 50 2>/dev/null || cat /var/log/docker.log 2>/dev/null || echo 'No logs available'");
@@ -393,9 +372,6 @@ private String getLimaLogs() {
         }
     }
 
-    /**
-     * Wait for Docker to be accessible.
-     */
     private boolean waitForDocker() throws InterruptedException {
         log.debug("Waiting for Docker daemon on localhost:{}...", dockerPort);
         long timeoutMillis = TimeUnit.SECONDS.toMillis(120);