Merge branch 'master' into feature_enable_push_in_deployment_view

This commit is contained in:
Gaurav
2016-08-10 17:20:28 +02:00

View File

@@ -12,6 +12,7 @@ import javax.validation.constraints.NotNull;
import org.springframework.hateoas.ResourceSupport; import org.springframework.hateoas.ResourceSupport;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
/** /**
@@ -34,7 +35,9 @@ public class DdiDeploymentBase extends ResourceSupport {
* @param deployment * @param deployment
* details. * details.
*/ */
public DdiDeploymentBase(final String id, final DdiDeployment deployment) { @JsonCreator
public DdiDeploymentBase(@JsonProperty("id") final String id,
@JsonProperty("deplyomentId") final DdiDeployment deployment) {
this.deplyomentId = id; this.deplyomentId = id;
this.deployment = deployment; this.deployment = deployment;
} }