diff --git a/workflow-engine/src/main/java/com/redhat/parodos/workflows/workflow/WorkFlowPropertiesMetadata.java b/workflow-engine/src/main/java/com/redhat/parodos/workflows/workflow/WorkFlowPropertiesMetadata.java index 47b378a4c..e26e2dd15 100644 --- a/workflow-engine/src/main/java/com/redhat/parodos/workflows/workflow/WorkFlowPropertiesMetadata.java +++ b/workflow-engine/src/main/java/com/redhat/parodos/workflows/workflow/WorkFlowPropertiesMetadata.java @@ -1,18 +1,12 @@ package com.redhat.parodos.workflows.workflow; import lombok.Builder; +import lombok.Data; @Builder +@Data public class WorkFlowPropertiesMetadata { private String version; - public String getVersion() { - return this.version; - } - - public void setVersion(String version) { - this.version = version; - } - } diff --git a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowPropertiesDefinitionDTO.java b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowPropertiesDefinitionDTO.java index f678542b8..f57e0bf02 100644 --- a/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowPropertiesDefinitionDTO.java +++ b/workflow-service-sdk/src/main/java/com/redhat/parodos/sdk/model/WorkFlowPropertiesDefinitionDTO.java @@ -27,6 +27,7 @@ /** * WorkFlowPropertiesDefinitionDTO */ +@lombok.Data @lombok.AllArgsConstructor @lombok.Builder @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class WorkFlowPropertiesDefinitionDTO { public static final String SERIALIZED_NAME_VERSION = "version"; diff --git a/workflow-service/src/main/java/com/redhat/parodos/project/controller/ProjectController.java b/workflow-service/src/main/java/com/redhat/parodos/project/controller/ProjectController.java index f56025444..a4fef7d60 100644 --- a/workflow-service/src/main/java/com/redhat/parodos/project/controller/ProjectController.java +++ b/workflow-service/src/main/java/com/redhat/parodos/project/controller/ProjectController.java @@ -82,7 +82,6 @@ public ResponseEntity createProject(@Valid @RequestBody Proj @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content), @ApiResponse(responseCode = "403", description = "Forbidden", content = @Content) }) @GetMapping - public ResponseEntity> getProjects() { return ResponseEntity.ok(projectService.getProjects()); } diff --git a/workflow-service/src/test/java/com/redhat/parodos/workflow/definition/dto/WorkFlowPropertiesDefinitionDTOTest.java b/workflow-service/src/test/java/com/redhat/parodos/workflow/definition/dto/WorkFlowPropertiesDefinitionDTOTest.java index 7d77c8969..c1833a8c8 100644 --- a/workflow-service/src/test/java/com/redhat/parodos/workflow/definition/dto/WorkFlowPropertiesDefinitionDTOTest.java +++ b/workflow-service/src/test/java/com/redhat/parodos/workflow/definition/dto/WorkFlowPropertiesDefinitionDTOTest.java @@ -3,7 +3,9 @@ import com.redhat.parodos.workflow.definition.entity.WorkFlowPropertiesDefinition; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; class WorkFlowPropertiesDefinitionDTOTest { diff --git a/workflow-service/src/test/java/com/redhat/parodos/workflow/execution/aspect/WorkFlowPropertiesAspectTest.java b/workflow-service/src/test/java/com/redhat/parodos/workflow/execution/aspect/WorkFlowPropertiesAspectTest.java index fe0494930..b59fd1430 100644 --- a/workflow-service/src/test/java/com/redhat/parodos/workflow/execution/aspect/WorkFlowPropertiesAspectTest.java +++ b/workflow-service/src/test/java/com/redhat/parodos/workflow/execution/aspect/WorkFlowPropertiesAspectTest.java @@ -52,7 +52,6 @@ public void testWorkFlowPropertiesAspectWithValidEnvData() { WorkFlowPropertiesAspect aspect = new WorkFlowPropertiesAspect(); aspect.env = env; - assertDoesNotThrow(() -> { Object result = aspect.setProperitesForWorkflow(workflow, properties); assertNotNull(result); @@ -65,7 +64,6 @@ public void testWorkFlowPropertiesAspectWithValidEnvData() { Mockito.verify(env, Mockito.times(1)).resolvePlaceholders("${git.commit.id}"); } - @Test public void testWorkFlowPropertiesAspectWithNoValidData() { // given