+++ /dev/null
-package org.onap.sdc.workflow.persistence.types;
-
-public enum VersionStatus {
-
- Draft,
- Certified;
-}
private String baseId;
private Date creationTime;
private Date modificationTime;
- private VersionStatus status;
+ private WorkflowVersionStatus status;
public WorkflowVersion(String id) {
this.id = id;
- this.status = VersionStatus.Draft;
+ this.status = WorkflowVersionStatus.DRAFT;
}
public WorkflowVersion() {
--- /dev/null
+package org.onap.sdc.workflow.persistence.types;
+
+public enum WorkflowVersionStatus {
+
+ DRAFT, CERTIFIED;
+}
import org.onap.sdc.workflow.api.types.VersionRequestDto;
import org.onap.sdc.workflow.persistence.types.WorkflowVersion;
import org.onap.sdc.workflow.persistence.types.ArtifactEntity;
+import org.springframework.web.multipart.MultipartFile;
public interface WorkflowVersionManager {
public VersionModificationException(String workflowId, String version) {
super(String.format("Error while trying to modify version for workflow id %s. "
- + "Version %s is Certified and can not be edited", workflowId, version));
+ + "Version %s is CERTIFIED and can not be edited", workflowId, version));
}
}
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
import org.onap.sdc.workflow.api.types.VersionRequestDto;
import org.onap.sdc.workflow.persistence.ArtifactRepository;
import org.onap.sdc.workflow.persistence.types.ArtifactEntity;
-import org.onap.sdc.workflow.persistence.types.VersionStatus;
+import org.onap.sdc.workflow.persistence.types.WorkflowVersionStatus;
import org.onap.sdc.workflow.persistence.types.WorkflowVersion;
import org.onap.sdc.workflow.services.WorkflowVersionManager;
import org.onap.sdc.workflow.services.exceptions.CreateVersionException;
@Override
public void uploadArtifact(String workflowId, WorkflowVersion version, MultipartFile artifact) {
WorkflowVersion retrievedVersion = get(workflowId, version.getId());
- if (VersionStatus.Certified.equals(retrievedVersion.getStatus())) {
+ if (WorkflowVersionStatus.CERTIFIED.equals(retrievedVersion.getStatus())) {
throw new VersionModificationException(workflowId, version.getId());
}
@Override
public void deleteArtifact(String workflowId, WorkflowVersion version) {
WorkflowVersion retrievedVersion = get(workflowId, version.getId());
- if (VersionStatus.Certified.equals(retrievedVersion.getStatus())) {
+ if (WorkflowVersionStatus.CERTIFIED.equals(retrievedVersion.getStatus())) {
throw new VersionModificationException(workflowId, version.getId());
}
package org.onap.sdc.workflow.services.mappers;
+import java.util.Collections;
+import java.util.Map;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Named;
+import org.onap.sdc.workflow.persistence.types.WorkflowProperty;
import org.onap.sdc.workflow.persistence.types.WorkflowVersion;
+import org.onap.sdc.workflow.persistence.types.WorkflowVersionStatus;
import org.openecomp.sdc.versioning.dao.types.Version;
+import org.openecomp.sdc.versioning.dao.types.VersionStatus;
-@Mapper(componentModel = "spring")
+@Mapper(componentModel = "spring", uses = VersionStatusMapper.class)
public interface VersionMapper {
+
WorkflowVersion versionToWorkflowVersion(Version version);
@InheritInverseConfiguration
Version workflowVersionToVersion(WorkflowVersion workflowVersion);
+
}
--- /dev/null
+package org.onap.sdc.workflow.services.mappers;
+
+import org.mapstruct.InheritInverseConfiguration;
+import org.mapstruct.Mapper;
+import org.mapstruct.ValueMapping;
+import org.mapstruct.ValueMappings;
+import org.onap.sdc.workflow.persistence.types.WorkflowVersionStatus;
+import org.openecomp.sdc.versioning.dao.types.VersionStatus;
+
+@Mapper(componentModel = "spring")
+public interface VersionStatusMapper {
+
+ @ValueMappings({@ValueMapping(source = "Certified", target = "CERTIFIED"),
+ @ValueMapping(source = "Draft", target = "DRAFT"),
+ @ValueMapping(source = "<ANY_REMAINING>", target = "DRAFT")})
+ WorkflowVersionStatus versionStatusToWorkflowVersionStatus(VersionStatus status);
+
+ @InheritInverseConfiguration
+ VersionStatus workflowVersionStatusToVersionStatus(WorkflowVersionStatus status);
+
+
+}
Workflow itemToWorkflow(Item item);
-
@InheritInverseConfiguration
Item workflowToItem(Workflow workflow);
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.onap.sdc.workflow.persistence.types.VersionStatus.*;
+import static org.onap.sdc.workflow.persistence.types.WorkflowVersionStatus.*;
import java.io.IOException;
import java.io.InputStream;
import java.util.Date;
import java.util.List;
import java.util.Optional;
-import java.util.Set;
import org.apache.commons.io.IOUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.onap.sdc.workflow.persistence.ArtifactRepository;
import org.onap.sdc.workflow.persistence.types.ArtifactEntity;
import org.onap.sdc.workflow.persistence.types.WorkflowVersion;
+import org.onap.sdc.workflow.persistence.types.WorkflowVersionStatus;
import org.onap.sdc.workflow.services.exceptions.CreateVersionException;
import org.onap.sdc.workflow.services.exceptions.EntityNotFoundException;
import org.onap.sdc.workflow.services.mappers.VersionMapper;
MockMultipartFile mockFile =
new MockMultipartFile("data", mockFileName, "text/plain", "some xml".getBytes());
WorkflowVersion version = new WorkflowVersion(VERSION1_ID);
- version.setStatus(org.onap.sdc.workflow.persistence.types.VersionStatus.Draft);
+ version.setStatus(WorkflowVersionStatus.DRAFT);
doReturn(version).when(workflowVersionManager).get(ITEM1_ID,VERSION1_ID);
workflowVersionManager.uploadArtifact(ITEM1_ID,version,mockFile);
@Test(expected = EntityNotFoundException.class)
public void shouldThrowExceptionWhenArtifactNotFound(){
WorkflowVersion version = new WorkflowVersion(VERSION1_ID);
- version.setStatus(Draft);
+ version.setStatus(DRAFT);
doReturn(version).when(workflowVersionManager).get(ITEM1_ID,VERSION1_ID);
doReturn(Optional.empty()).when(artifactRepositoryMock).get(ITEM1_ID,VERSION1_ID);
workflowVersionManager.getArtifact(ITEM1_ID,version);