Revert placeholders definition

Author: Francois Hervieux

src/main/java/com/xebialabs/deployit/ci/DeployitPerformer.java

@@ -130,20 +130,14 @@ public boolean doPerform() throws InterruptedException, IOException {
             final String versionId = Joiner.on("/").join(resolvedApplication, packageVersion);
             deploymentListener.info(Messages.DeployitNotifier_deploy(versionId, resolvedEnvironment));
 
-            Map<String, String> placeholders = new HashMap<String, String>();
-            if (deploymentParameters.deploymentOptions.placeholders != null) {
-                for (Placeholder placeholder : deploymentParameters.deploymentOptions.placeholders) {
-                    placeholders.put(placeholder.placeholderKey, envVars.expand(placeholder.placeholderValue));
-                }
-            }
             Map<String, String> deploymentProperties = new HashMap<String, String>();
             if (deploymentParameters.deploymentOptions.deploymentProperties != null) {
                 for (DeploymentProperty deploymentProperty : deploymentParameters.deploymentOptions.deploymentProperties) {
                     deploymentProperties.put(deploymentProperty.propertyName, envVars.expand(deploymentProperty.propertyValue));
                 }
             }
             try {
-                deployitServer.deploy(versionId, resolvedEnvironment, placeholders, deploymentProperties, deploymentParameters.deploymentOptions, deploymentListener);
+                deployitServer.deploy(versionId, resolvedEnvironment, deploymentProperties, deploymentParameters.deploymentOptions, deploymentListener);
             } catch (Exception e) {
                 deploymentListener.error(Messages._DeployitNotifier_errorDeploy(e.getMessage()));
                 return false;

src/main/java/com/xebialabs/deployit/ci/JenkinsDeploymentOptions.java

@@ -57,21 +57,19 @@ public class JenkinsDeploymentOptions implements Describable<JenkinsDeploymentOp
     public boolean skipMode;
     public boolean testMode;
     public boolean rollbackOnError;
-    public List<Placeholder> placeholders;
     public List<DeploymentProperty> deploymentProperties;
 
     public final VersionKind versionKind;
     public String version;
 
     @DataBoundConstructor
-    public JenkinsDeploymentOptions(String environment, VersionKind versionKind, boolean generateDeployedOnUpgrade, boolean skipMode, boolean testMode, boolean rollbackOnError, List<Placeholder> placeholders, List<DeploymentProperty> deploymentProperties) {
+    public JenkinsDeploymentOptions(String environment, VersionKind versionKind, boolean generateDeployedOnUpgrade, boolean skipMode, boolean testMode, boolean rollbackOnError, List<DeploymentProperty> deploymentProperties) {
         this.generateDeployedOnUpgrade = generateDeployedOnUpgrade;
         this.skipMode = skipMode;
         this.testMode = testMode;
         this.rollbackOnError = rollbackOnError;
         this.environment = environment;
         this.versionKind = versionKind;
-        this.placeholders = placeholders;
         this.deploymentProperties = deploymentProperties;
     }
 

src/main/java/com/xebialabs/deployit/ci/Placeholder.java

@@ -28,7 +28,6 @@
 import java.util.List;
 import java.util.Map;
 
-import com.xebialabs.deployit.ci.Placeholder;
 import org.apache.commons.lang.StringUtils;
 
 import com.google.common.base.Throwables;
@@ -89,7 +88,7 @@ private void verifyPackageExistInRemoteRepository(String deploymentPackage) {
 
     }
 
-    public void deploy(String deploymentPackage, String environment, Map<String, String> placeholders, Map<String, String> deploymentProperties) {
+    public void deploy(String deploymentPackage, String environment, Map<String, String> deploymentProperties) {
         listener.debug(deploymentOptions.toString());
 
         verifyPackageExistInRemoteRepository(deploymentPackage);
@@ -118,15 +117,6 @@ public void deploy(String deploymentPackage, String environment, Map<String, Str
         listener.debug(" dump Deployeds");
         for (ConfigurationItem itemDto : deployment.getDeployeds()) {
             listener.debug(" - " + itemDto);
-
-            Map<String, String> itemPlaceholders = itemDto.getProperty("placeholders");
-            for (Map.Entry<String, String> deploymentPlaceholder : placeholders.entrySet()) {
-                if (itemPlaceholders.containsKey(deploymentPlaceholder.getKey())) {
-                    String value = itemPlaceholders.get(deploymentPlaceholder.getKey());
-                    listener.info(String.format("Overriding value of placeholder %s with value %s (was %s) for %s", deploymentPlaceholder.getKey(), deploymentPlaceholder.getValue(), value, itemDto.getId()));
-                    itemPlaceholders.put(deploymentPlaceholder.getKey(), deploymentPlaceholder.getValue());
-                }
-            }
         }
 
         try {

src/main/java/com/xebialabs/deployit/ci/server/DeployCommand.java

@@ -23,7 +23,7 @@ public interface DeployitServer {
 
     ConfigurationItem importPackage(String darFile);
 
-    void deploy(String deploymentPackage, String environment, Map<String, String> placeholders, Map<String, String> deploymentProperties, JenkinsDeploymentOptions deploymentOptions, JenkinsDeploymentListener listener);
+    void deploy(String deploymentPackage, String environment, Map<String, String> deploymentProperties, JenkinsDeploymentOptions deploymentOptions, JenkinsDeploymentListener listener);
 
     DeployitCommunicator newCommunicator();
 

src/main/java/com/xebialabs/deployit/ci/server/DeployitServer.java

@@ -83,11 +83,11 @@ public ConfigurationItem importPackage(final String darFile) {
     }
 
     @Override
-    public void deploy(String deploymentPackage, String environment, Map<String, String> placeholders, Map<String, String> deploymentProperties, JenkinsDeploymentOptions deploymentOptions, JenkinsDeploymentListener listener) {
+    public void deploy(String deploymentPackage, String environment, Map<String, String> deploymentProperties, JenkinsDeploymentOptions deploymentOptions, JenkinsDeploymentListener listener) {
         DeploymentService deploymentService = getCommunicator().getProxies().getDeploymentService();
         TaskService taskService = getCommunicator().getProxies().getTaskService();
         RepositoryService repositoryService = getCommunicator().getProxies().getRepositoryService();
-        new DeployCommand(deploymentService, taskService, repositoryService, deploymentOptions, listener).deploy(deploymentPackage, environment, placeholders, deploymentProperties);
+        new DeployCommand(deploymentService, taskService, repositoryService, deploymentOptions, listener).deploy(deploymentPackage, environment, deploymentProperties);
     }
 
 

src/main/java/com/xebialabs/deployit/ci/server/DeployitServerImpl.java

@@ -81,9 +81,9 @@ protected Void run() throws Exception {
             String resolvedEnvironmentId = envVars.expand(step.environmentId);
             String resolvedPackageId = envVars.expand(step.packageId);
             JenkinsDeploymentListener deploymentListener = new JenkinsDeploymentListener(listener, false);
-            JenkinsDeploymentOptions deploymentOptions = new JenkinsDeploymentOptions(resolvedEnvironmentId, VersionKind.Other, true, false , false, true, null, null);
+            JenkinsDeploymentOptions deploymentOptions = new JenkinsDeploymentOptions(resolvedEnvironmentId, VersionKind.Other, true, false , false, true, null);
             DeployitServer deployitServer = RepositoryUtils.getDeployitServer(step.serverCredentials, null);
-            deployitServer.deploy(resolvedPackageId,resolvedEnvironmentId,new HashMap<String, String>(),new HashMap<String, String>(),deploymentOptions,deploymentListener);
+            deployitServer.deploy(resolvedPackageId,resolvedEnvironmentId,new HashMap<String, String>(),deploymentOptions,deploymentListener);
             return null;
         }
 

src/main/java/com/xebialabs/deployit/ci/workflow/XLDeployDeployStep.java

@@ -22,24 +22,6 @@
         <f:checkbox/>
     </f:entry>
 
-    <f:entry title="${%Placeholders}" description="Placeholders" field="placeholders" help="/plugin/deployit-plugin/help-placeholders.html">
-        <f:repeatable var="property" field="placeholders">
-            <table width="100%">
-                <f:entry title="${%Key}" field="placeholderKey">
-                    <f:textbox />
-                </f:entry>
-                <f:entry title="${%Value}" field="placeholderValue">
-                    <f:textbox />
-                </f:entry>
-                <f:entry title="">
-                    <div align="right">
-                        <f:repeatableDeleteButton />
-                    </div>
-                </f:entry>
-            </table>
-        </f:repeatable>
-    </f:entry>
-
     <f:entry title="${%Deployment Properties}" description="Deployment Properties" field="deploymentProperties" help="/plugin/deployit-plugin/help-deployment-properties.html">
         <f:repeatable var="property" field="deploymentProperties">
             <table width="100%">

src/main/resources/com/xebialabs/deployit/ci/JenkinsDeploymentOptions/config.jelly

@@ -49,7 +49,7 @@ public void shouldRetryTaskStatusCheckFiveTimesAfterExceptionOccurs() {
         DeploymentService deploymentService = mock(DeploymentService.class);
         TaskService taskService = mock(TaskService.class);
         RepositoryService repositoryService = mock(RepositoryService.class);
-        JenkinsDeploymentOptions jenkinsOptions = new JenkinsDeploymentOptions("test", VersionKind.Packaged, false, false, false, false, null, null);
+        JenkinsDeploymentOptions jenkinsOptions = new JenkinsDeploymentOptions("test", VersionKind.Packaged, false, false, false, false, null);
         JenkinsDeploymentListener jenkinsDeploymentListener = new JenkinsDeploymentListener(new StreamBuildListener(System.out, Charset.defaultCharset()), true);
         DeployCommand deployCommand = new DeployCommand(deploymentService, taskService, repositoryService, jenkinsOptions, jenkinsDeploymentListener);
 
@@ -71,7 +71,7 @@ public void shouldRetryTaskStatusCheckFiveTimesAfterExceptionOccurs() {
                 .thenThrow(new MyTestValidationException("Expect this to be rethrown"));
 
         try {
-            deployCommand.deploy("pkg", "test", new HashMap<String, String>(), new HashMap<String, String>());
+            deployCommand.deploy("pkg", "test", new HashMap<String, String>());
             fail("Expected exception after 5 failed attempts.");
         } catch  (MyTestValidationException e ) {
             //success