chore: worked on refactoring build service

Author: rhuss

pom.xml

@@ -122,6 +122,12 @@
       <version>1.1</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <version>1.17</version>
+    </dependency>
+
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>

src/main/java/io/fabric8/maven/docker/access/UrlBuilder.java

@@ -139,7 +139,7 @@ public String stopContainer(String containerId, int killWait) {
         return b.build();
     }
 
-    public String tagContainer(ImageName source, ImageName target, boolean force) {
+    public String tagImage(ImageName source, ImageName target, boolean force) {
         return u("images/%s/tag", source.getFullName())
                 .p("repo",target.getNameWithoutTag())
                 .p("tag",target.getTag())

src/main/java/io/fabric8/maven/docker/access/hc/DockerAccessWithHcClient.java

@@ -474,7 +474,7 @@ public void tag(String sourceImage, String targetImage, boolean force)
         ImageName source = new ImageName(sourceImage);
         ImageName target = new ImageName(targetImage);
         try {
-            String url = urlBuilder.tagContainer(source, target, force);
+            String url = urlBuilder.tagImage(source, target, force);
             delegate.post(url, HTTP_CREATED);
         } catch (IOException e) {
             throw new DockerAccessException(e, "Unable to add tag [%s] to image [%s]", targetImage,

src/main/java/io/fabric8/maven/docker/util/EnvUtil.java

@@ -4,29 +4,20 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.Properties;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.google.common.base.Splitter;
 import io.fabric8.maven.docker.build.BuildContext;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;

src/test/java/io/fabric8/maven/docker/UrlBuilderTest.java

@@ -120,7 +120,7 @@ public void pullImage() throws URISyntaxException {
     public void tagContainer() throws URISyntaxException {
         UrlBuilder builder = new UrlBuilder("", "1.0");
         assertEquals(new URI("/1.0/images/t1%3Alatest/tag?force=1&repo=new&tag=tag1"),
-                     new URI(builder.tagContainer(new ImageName("t1:latest"), new ImageName("new:tag1"), true)));
+                     new URI(builder.tagImage(new ImageName("t1:latest"), new ImageName("new:tag1"), true)));
 
     }
 }

src/test/java/io/fabric8/maven/docker/build/auth/RegistryAuthFactoryTest.java

@@ -12,11 +12,11 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import io.fabric8.maven.docker.build.auth.extended.EcrExtendedRegistryAuthHandler;
-import io.fabric8.maven.docker.build.docker.DockerRegistryAuthHandler;
 import io.fabric8.maven.docker.build.auth.handler.FromConfigRegistryAuthHandler;
 import io.fabric8.maven.docker.build.auth.handler.OpenShiftRegistryAuthHandler;
-import io.fabric8.maven.docker.build.maven.SettingsRegistrysAuthHandler;
 import io.fabric8.maven.docker.build.auth.handler.SystemPropertyRegistryAuthHandler;
+import io.fabric8.maven.docker.build.docker.DockerRegistryAuthHandler;
+import io.fabric8.maven.docker.build.maven.SettingsRegistrysAuthHandler;
 import io.fabric8.maven.docker.util.JsonFactory;
 import io.fabric8.maven.docker.util.Logger;
 import mockit.Expectations;
@@ -39,13 +39,11 @@
 
 import static java.util.Collections.singletonMap;
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.hasProperty;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 /**