Fix code style

fabric8io · May 20, 2024 · f1fec98 · f1fec98
1 parent 5621aad
commit f1fec98
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 27 deletions.
diff --git a/src/main/java/io/fabric8/maven/docker/TagMojo.java b/src/main/java/io/fabric8/maven/docker/TagMojo.java
@@ -35,10 +35,7 @@ public void executeInternal(ServiceHub hub) throws DockerAccessException, MojoEx
         List<ImageConfiguration> imageConfigs = getResolvedImages();
         for (ImageConfiguration imageConfig : imageConfigs) {
             BuildImageConfiguration buildConfig = imageConfig.getBuildConfiguration();
-            if (buildConfig.skipTag()) {
-                continue;
-            }
-            if (buildConfig.isBuildX()) {
+            if (buildConfig.skipTag() || buildConfig.isBuildX()) {
                 // Tag happens at the building stage.
                 continue;
             }

diff --git a/src/main/java/io/fabric8/maven/docker/config/BuildImageConfiguration.java b/src/main/java/io/fabric8/maven/docker/config/BuildImageConfiguration.java
@@ -415,7 +415,7 @@ public boolean skipPush() {
     }
 
     public boolean skipTag() {
-        return skipTag != null ? skipTag : false;
+        return skipTag != null && skipTag;
     }
 
     public boolean useDefaultExcludes() {

diff --git a/src/test/java/io/fabric8/maven/docker/TagMojoTest.java b/src/test/java/io/fabric8/maven/docker/TagMojoTest.java
@@ -3,37 +3,15 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import io.fabric8.maven.docker.access.AuthConfig;
-import io.fabric8.maven.docker.access.AuthConfigList;
-import io.fabric8.maven.docker.access.DockerAccessException;
-import io.fabric8.maven.docker.assembly.DockerAssemblyManager;
-import io.fabric8.maven.docker.config.AttestationConfiguration;
-import io.fabric8.maven.docker.config.BuildImageConfiguration;
 import io.fabric8.maven.docker.config.BuildXConfiguration;
 import io.fabric8.maven.docker.config.ImageConfiguration;
-import io.fabric8.maven.docker.service.BuildService;
-import io.fabric8.maven.docker.service.BuildXService;
-import io.fabric8.maven.docker.service.ImagePullManager;
-import io.fabric8.maven.docker.util.ImageName;
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.io.TempDir;
-import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)