import org.onap.sdc.workflow.api.types.CollectionResponse;
import org.onap.sdc.workflow.api.types.VersionStateDto;
import org.onap.sdc.workflow.api.types.VersionStatesFormatter;
+import org.onap.sdc.workflow.api.types.WorkflowVersionValidator;
import org.onap.sdc.workflow.persistence.types.ArtifactEntity;
import org.onap.sdc.workflow.persistence.types.WorkflowVersion;
import org.onap.sdc.workflow.services.WorkflowVersionManager;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
-import org.springframework.validation.Validator;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.InitBinder;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
public class WorkflowVersionController {
private final WorkflowVersionManager workflowVersionManager;
- private Validator validator;
-
- @InitBinder("WorkflowVersion")
- private void initBinder(WebDataBinder binder) {
- binder.addValidators(validator);
- }
+ private final WorkflowVersionValidator versionValidator;
@Autowired
public WorkflowVersionController(@Qualifier("workflowVersionManager") WorkflowVersionManager workflowVersionManager,
- @Qualifier("workflowVersionValidator") Validator validator) {
+ @Qualifier("WorkflowVersionValidator") WorkflowVersionValidator versionValidator) {
this.workflowVersionManager = workflowVersionManager;
- this.validator = validator;
+ this.versionValidator = versionValidator;
}
@ApiImplicitParam(name = "state", dataType = "string", paramType = "query",
@PostMapping
@ApiOperation("Create workflow version")
- public ResponseEntity<WorkflowVersion> create(@RequestBody @Validated WorkflowVersion version,
+ public ResponseEntity<WorkflowVersion> create(@RequestBody WorkflowVersion version,
@PathVariable("workflowId") String workflowId,
@RequestParam(value = "baseVersionId", required = false) String baseVersionId,
@RequestHeader(USER_ID_HEADER) String user) {
+ versionValidator.validate(workflowId,version);
WorkflowVersion createdVersion = workflowVersionManager.create(workflowId, baseVersionId, version);
return new ResponseEntity<>(createdVersion, HttpStatus.CREATED);
}
@PutMapping("/{versionId}")
@ApiOperation("Update workflow version")
- public void update(@RequestBody @Validated WorkflowVersion version, @PathVariable("workflowId") String workflowId,
+ public void update(@RequestBody WorkflowVersion version, @PathVariable("workflowId") String workflowId,
@PathVariable("versionId") String versionId, @RequestHeader(USER_ID_HEADER) String user) {
+ versionValidator.validate(workflowId,version);
version.setId(versionId);
workflowVersionManager.update(workflowId, version);
}
import org.onap.sdc.workflow.services.exceptions.VersionCreationException;
import org.onap.sdc.workflow.services.exceptions.VersionModificationException;
import org.onap.sdc.workflow.services.exceptions.VersionStateModificationException;
+import org.onap.sdc.workflow.services.exceptions.VersionValidationException;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@ExceptionHandler({InvalidArtifactException.class, VersionModificationException.class,
- VersionStateModificationException.class})
+ VersionStateModificationException.class, VersionValidationException.class})
public final ResponseEntity<String> handleInvalidArtifactException(
Exception exception) {
return new ResponseEntity<>(exception.getMessage(), UNPROCESSABLE_ENTITY);
--- /dev/null
+package org.onap.sdc.workflow.api.types;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import org.onap.sdc.workflow.persistence.types.ParameterEntity;
+import org.onap.sdc.workflow.persistence.types.WorkflowVersion;
+import org.onap.sdc.workflow.services.exceptions.VersionValidationException;
+import org.springframework.stereotype.Component;
+
+@Component("WorkflowVersionValidator")
+public class WorkflowVersionValidator {
+
+ public void validate(String workflowId, WorkflowVersion workflowVersion) {
+
+ if(containsDuplicates( workflowVersion.getInputs())){
+ throw new VersionValidationException(workflowId,"Input name must be unique");
+
+ }
+
+ if(containsDuplicates(workflowVersion.getOutputs())){
+ throw new VersionValidationException(workflowId ,"Output name must be unique");
+ }
+ }
+
+ private boolean containsDuplicates(Collection<ParameterEntity> parameters){
+ if(Objects.isNull(parameters) || parameters.size() < 2 ) {
+ return false;
+ }
+ Set<String> testSet = new HashSet<>();
+ return parameters.stream().anyMatch(s -> !testSet.add(s.getName()));
+ }
+}
+++ /dev/null
-/*
- * Copyright © 2018 European Support Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.sdc.workflow.api.validator;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-import org.onap.sdc.workflow.persistence.types.ParameterEntity;
-import org.onap.sdc.workflow.persistence.types.WorkflowVersion;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.Errors;
-import org.springframework.validation.Validator;
-
-
-@Component("workflowVersionValidator")
-public class WorkflowVersionValidator implements Validator{
-
- @Override
- public boolean supports(Class<?> aClass) {
- return WorkflowVersion.class.equals(aClass);
- }
-
- @Override
- public void validate(Object o, Errors errors) {
-
- WorkflowVersion workflowVersion = (WorkflowVersion) o;
- Collection<ParameterEntity> inputs = workflowVersion.getInputs();
- Collection<ParameterEntity> outputs = workflowVersion.getOutputs();
-
- if(containsDuplicates(inputs)){
- errors.rejectValue("inputs", "duplicateName", new Object[] {inputs}, "Input name must be unique");
- }
-
- if(containsDuplicates(outputs)){
- errors.rejectValue("outputs", "duplicateName", new Object[] {outputs}, "Output name must be unique");
- }
- }
-
- private boolean containsDuplicates(Collection<ParameterEntity> parameters){
- if(Objects.isNull(parameters) || parameters.size() < 2 ) {
- return false;
- }
- Set<String> testSet = new HashSet<>();
- return parameters.stream().anyMatch(s -> !testSet.add(s.getName()));
- }
-}
--- /dev/null
+package org.onap.sdc.workflow.services.exceptions;
+
+public class VersionValidationException extends RuntimeException{
+
+ private static final String MSG = "Error creating or modifying version for workflow with id %s: %s";
+
+ public VersionValidationException(String workflowId, String detailedMessage) {
+ super(String.format(MSG, workflowId, detailedMessage));
+ }
+}
package org.onap.sdc.workflow.api;
-import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
-import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.onap.sdc.workflow.RestPath;
+import org.onap.sdc.workflow.api.types.WorkflowVersionValidator;
import org.onap.sdc.workflow.persistence.types.WorkflowVersion;
import org.onap.sdc.workflow.services.WorkflowVersionManager;
import org.openecomp.sdc.versioning.dao.types.Version;
@Mock
private WorkflowVersionManager workflowVersionManagerMock;
+ @Mock
+ private WorkflowVersionValidator versionValidator;
+
@InjectMocks
private WorkflowVersionController workflowVersionController;
WorkflowVersion version = new WorkflowVersion();
version.setDescription("VersionDescription");
+ doNothing().when(versionValidator).validate(eq(ITEM1_ID),any(WorkflowVersion.class));
mockMvc.perform(post(RestPath.getWorkflowVersions(ITEM1_ID)).header(RestParams.USER_ID_HEADER, USER_ID)
.contentType(APPLICATION_JSON)
.content(GSON.toJson(version)))
public void shouldUpdateWorkflowVersionWhenCallingPutREST() throws Exception {
WorkflowVersion version = new WorkflowVersion();
version.setDescription("Updated");
+ doNothing().when(versionValidator).validate(eq(ITEM1_ID),any(WorkflowVersion.class));
MockHttpServletResponse result = mockMvc.perform(
put(RestPath.getWorkflowVersion(ITEM1_ID, VERSION1_ID)).header(RestParams.USER_ID_HEADER, USER_ID)
--- /dev/null
+/*
+ * Copyright © 2018 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onap.sdc.workflow.api.types;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.fail;
+
+import java.util.Arrays;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.onap.sdc.workflow.persistence.types.ParameterEntity;
+import org.onap.sdc.workflow.persistence.types.WorkflowVersion;
+import org.onap.sdc.workflow.services.exceptions.VersionValidationException;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+public class WorkflowVersionValidatorTest {
+
+ private static final String ITEM1_ID = "item_id_1";
+
+ @InjectMocks
+ private WorkflowVersionValidator versionValidator;
+
+ @Test
+ public void invalidInputs() {
+ WorkflowVersion workflowVersion = new WorkflowVersion();
+ workflowVersion.setDescription("version description");
+ ParameterEntity input = new ParameterEntity();
+ input.setName("input1");
+ workflowVersion.setInputs(Arrays.asList(input, input));
+ try {
+ versionValidator.validate(ITEM1_ID, workflowVersion);
+ fail("Should have thrown VersionValidationException but did not!");
+
+ } catch (VersionValidationException ex) {
+ assertEquals(String.format("Error creating or modifying version for workflow with id %s: %s", ITEM1_ID,
+ "Input name must be unique"), ex.getMessage());
+ }
+ }
+
+ @Test
+ public void invalidOtputs(){
+ WorkflowVersion workflowVersion = new WorkflowVersion();
+ workflowVersion.setDescription("version description");
+ ParameterEntity output = new ParameterEntity();
+ output.setName("output1");
+ workflowVersion.setOutputs(Arrays.asList(output, output));
+ try {
+ versionValidator.validate(ITEM1_ID, workflowVersion);
+ fail("Should have thrown VersionValidationException but did not!");
+
+ } catch (VersionValidationException ex) {
+ assertEquals(String.format("Error creating or modifying version for workflow with id %s: %s", ITEM1_ID,
+ "Output name must be unique"), ex.getMessage());
+ }
+ }
+}
Code Review / sdc / sdc-workflow-designer.git / commitdiff