deploymentUrl changed to deploymentPath:String

Author: Kindratte

src/main/java/org/scm4j/deployer/api/Action.java

@@ -8,7 +8,7 @@
 public class Action implements IAction {
 
     @Getter
-    final private Class<? extends IComponentDeployer> installerClass;
+    private final Class<? extends IComponentDeployer> installerClass;
     @Getter private Map<String, Object> params;
     private final Component comp;
 

src/main/java/org/scm4j/deployer/api/Component.java

@@ -9,7 +9,7 @@
 public class Component implements IComponent {
 
     @Getter
-    final private Artifact artifactCoords;
+    private final Artifact artifactCoords;
     @Getter
     private IDeploymentProcedure deploymentProcedure;
     private final ProductStructure ps;
@@ -36,4 +36,19 @@ public String toString() {
                 "artifactCoords=" + artifactCoords +
                 '}';
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Component component = (Component) o;
+
+        return artifactCoords.equals(component.artifactCoords);
+    }
+
+    @Override
+    public int hashCode() {
+        return artifactCoords.hashCode();
+    }
 }

src/main/java/org/scm4j/deployer/api/DeploymentContext.java

@@ -3,15 +3,14 @@
 import lombok.Data;
 
 import java.io.File;
-import java.net.URL;
 import java.util.Map;
 
 @Data
 public class DeploymentContext implements IDeploymentContext {
 
-    private String mainArtifact;
+    private final String mainArtifact;
     private Map<String, File> artifacts;
-    private URL deploymentURL;
+    private String deploymentPath;
 
     public DeploymentContext(String mainArtifact) {
         this.mainArtifact = mainArtifact;

src/main/java/org/scm4j/deployer/api/DeploymentProcedure.java

@@ -7,6 +7,6 @@
 @Data
 public class DeploymentProcedure implements IDeploymentProcedure {
 
-    final private List<IComponentDeployer> componentDeployers;
+    private final List<IComponentDeployer> componentDeployers;
 
 }

src/main/java/org/scm4j/deployer/api/IDeployedProduct.java

@@ -1,10 +1,8 @@
 package org.scm4j.deployer.api;
 
-import java.net.URL;
-
 public interface IDeployedProduct extends IProduct {
 
-    URL getDeploymentUrl();
+    String getDeploymentPath();
     String getProductVersion();
 
 }

src/main/java/org/scm4j/deployer/api/IDeploymentContext.java

@@ -1,13 +1,13 @@
 package org.scm4j.deployer.api;
 
 import java.io.File;
-import java.net.URL;
 import java.util.Map;
 
 public interface IDeploymentContext {
 
     String getMainArtifact();
     Map<String, File> getArtifacts();
-    URL getDeploymentURL();
+
+    String getDeploymentPath();
 
 }

src/main/java/org/scm4j/deployer/api/IProductStructure.java

@@ -1,9 +1,8 @@
 package org.scm4j.deployer.api;
 
-import java.net.URL;
 import java.util.List;
 
 public interface IProductStructure {
-    URL getDefaultDeploymentURL();
+    String getDefaultDeploymentPath();
     List<IComponent> getComponents();
 }

src/main/java/org/scm4j/deployer/api/ProductStructure.java

@@ -2,36 +2,31 @@
 
 import lombok.Getter;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class ProductStructure implements IProductStructure {
 
     @Getter
-    private URL defaultDeploymentURL;
+    private String defaultDeploymentPath;
     @Getter
     private List<IComponent> components;
 
-    private ProductStructure() {
+    private ProductStructure(String defaultDeploymentPath) {
+        this.defaultDeploymentPath = defaultDeploymentPath;
     }
 
-    public static ProductStructure create(String defaultDeploymentURL) {
-        URL url;
-        try {
-            url = new URL(defaultDeploymentURL);
-        } catch (MalformedURLException e) {
-            throw new RuntimeException("Invalid URL: " + defaultDeploymentURL);
-        }
-        ProductStructure ps = new ProductStructure();
-        ps.defaultDeploymentURL = url;
+    public static ProductStructure create(String defaultDeploymentPath) {
+        ProductStructure ps = new ProductStructure(defaultDeploymentPath);
         ps.components = new ArrayList<>();
         return ps;
     }
 
     public static ProductStructure createEmptyStructure() {
-        return new ProductStructure();
+        ProductStructure ps = new ProductStructure("");
+        ps.components = Collections.emptyList();
+        return ps;
     }
 
     public Component addComponent(String component) {

src/test/java/org/scm4j/deployer/api/ApiTest.java

@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import java.util.Collections;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -40,9 +42,12 @@ public void init(IDeploymentContext depCtx) {
                 .parent()
                 .addComponent("345:345:345")
                 .parent();
-        assertEquals(ps.getDefaultDeploymentURL().toString(), "file:/C:/smth");
+        assertEquals(ps.getDefaultDeploymentPath(), "file:/C:/smth");
         assertEquals(ps.getComponents().get(0).getArtifactCoords().toString(), "123:123:jar:123");
         assertEquals(ps.getComponents().get(1).getArtifactCoords().toString(), "345:345:jar:345");
         assertNotNull(ps.getComponents().get(0).getDeploymentProcedure().getComponentDeployers().get(0));
+        ps = ProductStructure.createEmptyStructure();
+        assertEquals(ps.getDefaultDeploymentPath(), "");
+        assertEquals(ps.getComponents(), Collections.emptyList());
     }
 }