Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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<DeserializationFeature, Boolean>() );
return build( mapper, emptyMap() );
}

public static ObjectMapper build( ObjectMapper mapper, Map<DeserializationFeature, Boolean> configuration )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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" )
Expand All @@ -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;
Expand Down