diff --git a/base-api-client/src/main/java/com/cloudesire/platform/apiclient/ObjectMapperFactory.java b/base-api-client/src/main/java/com/cloudesire/platform/apiclient/ObjectMapperFactory.java index 107d909d9..068d62e75 100644 --- a/base-api-client/src/main/java/com/cloudesire/platform/apiclient/ObjectMapperFactory.java +++ b/base-api-client/src/main/java/com/cloudesire/platform/apiclient/ObjectMapperFactory.java @@ -6,15 +6,16 @@ import com.fasterxml.jackson.databind.module.SimpleModule; import java.util.EnumMap; -import java.util.HashMap; import java.util.Map; import java.util.TimeZone; +import static java.util.Collections.emptyMap; + public class ObjectMapperFactory { public static ObjectMapper build( ObjectMapper mapper ) { - return build( mapper, new HashMap() ); + return build( mapper, emptyMap() ); } public static ObjectMapper build( ObjectMapper mapper, Map configuration ) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java index 785f80888..66245721a 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/BulkImportResultDTO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.time.LocalDateTime; import java.util.List; import java.util.Objects; @@ -13,6 +14,8 @@ public class BulkImportResultDTO extends DTO @ApiModelProperty( "Bulk import request ID" ) private String requestId; + private LocalDateTime execution; + private UrlEntityDTO executor; @ApiModelProperty( value = "What kind of import it has been requested", example = "CatalogCloudPricingCsvDTO,CatalogDistributorPricingCsvDTO" ) @@ -30,6 +33,16 @@ public void setRequestId( String requestId ) this.requestId = requestId; } + public LocalDateTime getExecution() + { + return execution; + } + + public void setExecution( LocalDateTime execution ) + { + this.execution = execution; + } + public UrlEntityDTO getExecutor() { return executor;