diff --git a/checkstyle.xml b/checkstyle.xml new file mode 100644 index 000000000..6907b5a99 --- /dev/null +++ b/checkstyle.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/notification-service/pom.xml b/notification-service/pom.xml index 7d73b0c22..8f4a73fcf 100644 --- a/notification-service/pom.xml +++ b/notification-service/pom.xml @@ -248,6 +248,10 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + diff --git a/notification-service/src/main/java/com/redhat/parodos/notification/util/SecurityUtil.java b/notification-service/src/main/java/com/redhat/parodos/notification/util/SecurityUtil.java index 9d02de334..08ca71750 100644 --- a/notification-service/src/main/java/com/redhat/parodos/notification/util/SecurityUtil.java +++ b/notification-service/src/main/java/com/redhat/parodos/notification/util/SecurityUtil.java @@ -40,8 +40,9 @@ public String getUsername() { if (ldapDetails != null) { return ldapDetails.getUsername(); } - else + else { log.error("Unable to get the LdapDetails to get the username"); + } return null; } diff --git a/parodos-model-api/pom.xml b/parodos-model-api/pom.xml index 6963fdb04..53ef2bba4 100644 --- a/parodos-model-api/pom.xml +++ b/parodos-model-api/pom.xml @@ -103,6 +103,10 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + \ No newline at end of file diff --git a/parodos-model-api/src/main/java/com/redhat/parodos/workflow/annotation/Escalation.java b/parodos-model-api/src/main/java/com/redhat/parodos/workflow/annotation/Escalation.java index 90052a22b..650a1e177 100644 --- a/parodos-model-api/src/main/java/com/redhat/parodos/workflow/annotation/Escalation.java +++ b/parodos-model-api/src/main/java/com/redhat/parodos/workflow/annotation/Escalation.java @@ -26,7 +26,7 @@ * * @author Luke Shannon (Github: lshannon) * @author Gloria Ciavarrini (Github: gciavarrini) - * + * */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/parodos-model-api/src/main/java/com/redhat/parodos/workflow/parameter/WorkParameter.java b/parodos-model-api/src/main/java/com/redhat/parodos/workflow/parameter/WorkParameter.java index 47675e03f..d7a7a1a1d 100644 --- a/parodos-model-api/src/main/java/com/redhat/parodos/workflow/parameter/WorkParameter.java +++ b/parodos-model-api/src/main/java/com/redhat/parodos/workflow/parameter/WorkParameter.java @@ -64,14 +64,16 @@ public Map getAsJsonSchema() { Map properties = type.getAsJsonSchema(); properties.put(REQUIRED, !optional); properties.put(DESCRIPTION, description); - if (valueProviderName != null && !valueProviderName.isEmpty()) + if (valueProviderName != null && !valueProviderName.isEmpty()) { properties.put(VALUE_PROVIDER_NAME, valueProviderName); + } if (type.isSelect() && selectOptions != null && !selectOptions.isEmpty()) { properties.put(ENUM, selectOptions); } - if (jsonSchemaOptions != null) + if (jsonSchemaOptions != null) { properties.putAll(jsonSchemaOptions); + } return properties; } diff --git a/pattern-detection-library/pom.xml b/pattern-detection-library/pom.xml index adf7e46d7..d95f0d8cd 100644 --- a/pattern-detection-library/pom.xml +++ b/pattern-detection-library/pom.xml @@ -79,4 +79,13 @@ ${guava.version} + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + \ No newline at end of file diff --git a/pattern-detection-library/src/main/java/com/redhat/parodos/patterndetection/exceptions/PatternDetectionRuntimeException.java b/pattern-detection-library/src/main/java/com/redhat/parodos/patterndetection/exceptions/PatternDetectionRuntimeException.java index c9257bcb1..0043e2fa5 100644 --- a/pattern-detection-library/src/main/java/com/redhat/parodos/patterndetection/exceptions/PatternDetectionRuntimeException.java +++ b/pattern-detection-library/src/main/java/com/redhat/parodos/patterndetection/exceptions/PatternDetectionRuntimeException.java @@ -16,8 +16,8 @@ package com.redhat.parodos.patterndetection.exceptions; /** - * A catch all thrown when when issues occur during the execution of scans in the WorkFlow - * + * A catch-all thrown when issues occur during the execution of scans in the WorkFlow + * * @author Luke Shannon (Github: lshannon) * */ diff --git a/pom.xml b/pom.xml index 71c427688..01083501b 100644 --- a/pom.xml +++ b/pom.xml @@ -225,6 +225,37 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.1 + + + com.puppycrawl.tools + checkstyle + 9.3 + + + io.spring.javaformat + spring-javaformat-checkstyle + 0.0.38 + + + + + checkstyle-validation + validate + true + + checkstyle.xml + true + + + check + + + + diff --git a/prebuilt-tasks/pom.xml b/prebuilt-tasks/pom.xml index 3fc58171a..01501f526 100644 --- a/prebuilt-tasks/pom.xml +++ b/prebuilt-tasks/pom.xml @@ -135,4 +135,13 @@ test + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + diff --git a/prebuilt-tasks/src/test/java/com/redhat/parodos/tasks/migrationtoolkit/SubmitAnalysisTaskTest.java b/prebuilt-tasks/src/test/java/com/redhat/parodos/tasks/migrationtoolkit/SubmitAnalysisTaskTest.java index b65b2eab2..ff9385e97 100644 --- a/prebuilt-tasks/src/test/java/com/redhat/parodos/tasks/migrationtoolkit/SubmitAnalysisTaskTest.java +++ b/prebuilt-tasks/src/test/java/com/redhat/parodos/tasks/migrationtoolkit/SubmitAnalysisTaskTest.java @@ -15,7 +15,9 @@ import static com.redhat.parodos.workflows.workflow.WorkContextAssert.assertThat; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class SubmitAnalysisTaskTest { diff --git a/sdk-utils/pom.xml b/sdk-utils/pom.xml index 063d98b59..f061a5021 100644 --- a/sdk-utils/pom.xml +++ b/sdk-utils/pom.xml @@ -53,4 +53,12 @@ + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + \ No newline at end of file diff --git a/workflow-examples/pom.xml b/workflow-examples/pom.xml index 1c427ec66..4ab00d27a 100644 --- a/workflow-examples/pom.xml +++ b/workflow-examples/pom.xml @@ -177,6 +177,10 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + diff --git a/workflow-examples/src/main/java/com/redhat/parodos/examples/complex/parameter/ComplexWorkParameterValueProvider.java b/workflow-examples/src/main/java/com/redhat/parodos/examples/complex/parameter/ComplexWorkParameterValueProvider.java index 4f2a4d199..1e1c96364 100644 --- a/workflow-examples/src/main/java/com/redhat/parodos/examples/complex/parameter/ComplexWorkParameterValueProvider.java +++ b/workflow-examples/src/main/java/com/redhat/parodos/examples/complex/parameter/ComplexWorkParameterValueProvider.java @@ -38,7 +38,7 @@ public List getValues(List getValues(List + + org.apache.maven.plugins + maven-checkstyle-plugin + diff --git a/workflow-service/src/main/java/com/redhat/parodos/security/SecurityUtils.java b/workflow-service/src/main/java/com/redhat/parodos/security/SecurityUtils.java index a0837a052..9f9a176bc 100644 --- a/workflow-service/src/main/java/com/redhat/parodos/security/SecurityUtils.java +++ b/workflow-service/src/main/java/com/redhat/parodos/security/SecurityUtils.java @@ -43,8 +43,9 @@ public static String getUsername() { if (ldapDetails != null) { return ldapDetails.getUsername(); } - else + else { log.error("Unable to get the LdapDetails to get the username"); + } return null; } diff --git a/workflow-service/src/main/java/com/redhat/parodos/workflow/WorkFlowDelegate.java b/workflow-service/src/main/java/com/redhat/parodos/workflow/WorkFlowDelegate.java index 75880d66e..e65da622c 100644 --- a/workflow-service/src/main/java/com/redhat/parodos/workflow/WorkFlowDelegate.java +++ b/workflow-service/src/main/java/com/redhat/parodos/workflow/WorkFlowDelegate.java @@ -56,9 +56,10 @@ public WorkContext initWorkFlowContext(WorkFlowRequestDTO workFlowRequestDTO, workFlowRequestDTO.getWorkFlowName(), WorkContextDelegate.Resource.ARGUMENTS, WorkFlowDTOUtil.convertArgumentListToMap(workFlowRequestDTO.getArguments())); } - if (mainWorkFlowDefinitionDto.getWorks() != null && !mainWorkFlowDefinitionDto.getWorks().isEmpty()) + if (mainWorkFlowDefinitionDto.getWorks() != null && !mainWorkFlowDefinitionDto.getWorks().isEmpty()) { mainWorkFlowDefinitionDto.getWorks().forEach(work -> initWorkContext(workContext, workFlowRequestDTO.findFirstWorkByName(work.getName()), work, mainWorkFlowDefinitionDto.getName())); + } return workContext; } @@ -74,12 +75,13 @@ private void initWorkContext(WorkContext workContext, WorkFlowRequestDTO.WorkReq workRequestDTO.getWorkName(), WorkContextDelegate.Resource.ARGUMENTS, WorkFlowDTOUtil.convertArgumentListToMap(workRequestDTO.getArguments()))); - if (workDefinitionResponseDTO.getWorks() != null) + if (workDefinitionResponseDTO.getWorks() != null) { workDefinitionResponseDTO.getWorks() .forEach(work -> initWorkContext( workContext, Optional.ofNullable(workRequestDTO) .map(dto -> dto.findFirstWorkByName(work.getName())).orElse(null), work, workDefinitionResponseDTO.getName())); + } } public WorkFlow getWorkFlowByName(String workFlowName) { diff --git a/workflow-service/src/main/java/com/redhat/parodos/workflow/definition/parameter/WorkParameterServiceImpl.java b/workflow-service/src/main/java/com/redhat/parodos/workflow/definition/parameter/WorkParameterServiceImpl.java index e729257e4..c26aafdcd 100644 --- a/workflow-service/src/main/java/com/redhat/parodos/workflow/definition/parameter/WorkParameterServiceImpl.java +++ b/workflow-service/src/main/java/com/redhat/parodos/workflow/definition/parameter/WorkParameterServiceImpl.java @@ -50,8 +50,9 @@ private WorkParameterValueResponseDTO mappingParameterResponse(String workflowDe WorkParameterValueResponse workParameterValueResponse) { String workName = Optional.ofNullable(workParameterValueResponse.getWorkName()).orElse(workflowDefinitionName); Map parameters = workFlowDefinitionService.getWorkParametersByWorkName(workName); - if (parameters == null || !parameters.containsKey(workParameterValueResponse.getKey())) + if (parameters == null || !parameters.containsKey(workParameterValueResponse.getKey())) { return null; + } String propertyPath = workName; WorkFlowDefinition workFlowDefinition = workFlowDefinitionService.getParentWorkFlowByWorkName(workName); diff --git a/workflow-service/src/main/java/com/redhat/parodos/workflow/definition/service/WorkFlowDefinitionServiceImpl.java b/workflow-service/src/main/java/com/redhat/parodos/workflow/definition/service/WorkFlowDefinitionServiceImpl.java index bf1c4fff5..bbf431460 100644 --- a/workflow-service/src/main/java/com/redhat/parodos/workflow/definition/service/WorkFlowDefinitionServiceImpl.java +++ b/workflow-service/src/main/java/com/redhat/parodos/workflow/definition/service/WorkFlowDefinitionServiceImpl.java @@ -92,8 +92,9 @@ public WorkFlowDefinitionServiceImpl(WorkFlowDefinitionRepository workFlowDefini private HashMap> convertWorkParameters(List workParameters) { HashMap> result = new HashMap<>(); for (WorkParameter workParameter : workParameters) { - if (workParameter == null) + if (workParameter == null) { continue; + } result.put(workParameter.getKey(), workParameter.getAsJsonSchema()); } diff --git a/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/aspect/AssessmentInfrastructureWorkFlowPostInterceptor.java b/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/aspect/AssessmentInfrastructureWorkFlowPostInterceptor.java index 7a347fd12..ef274a25e 100644 --- a/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/aspect/AssessmentInfrastructureWorkFlowPostInterceptor.java +++ b/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/aspect/AssessmentInfrastructureWorkFlowPostInterceptor.java @@ -73,7 +73,7 @@ public WorkReport handlePostWorkFlowExecution() { workFlowCheckerDefinition.getCheckWorkFlow().getId(), mainWorkFlowExecution)) .toList(); - for (WorkFlowExecution checkerExecution : checkerExecutions) + for (WorkFlowExecution checkerExecution : checkerExecutions) { if (checkerExecution != null && checkerExecution.getStatus() == WorkStatus.REJECTED) { log.info("fail workflow: {} because it has declined checker(s)", workFlowDefinition.getName()); workFlowExecution.setStatus(WorkStatus.FAILED); @@ -88,6 +88,7 @@ else if (checkerExecution == null || checkerExecution.getStatus() == WorkStatus. workFlowExecution.setStatus(WorkStatus.IN_PROGRESS); report = new DefaultWorkReport(WorkStatus.IN_PROGRESS, workContext); } + } workFlowService.updateWorkFlow(workFlowExecution); return report; diff --git a/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/aspect/CheckerWorkFlowPostInterceptor.java b/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/aspect/CheckerWorkFlowPostInterceptor.java index 5d441bca6..988a70e61 100644 --- a/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/aspect/CheckerWorkFlowPostInterceptor.java +++ b/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/aspect/CheckerWorkFlowPostInterceptor.java @@ -104,11 +104,12 @@ private void startOrStopWorkFlowCheckerOnSchedule(WorkFlow workFlow, * restart main workflow execution with same execution Id when there is no other * active checkers */ - if (workFlowService.findRunningChecker(mainWorkFlowExecution).isEmpty()) + if (workFlowService.findRunningChecker(mainWorkFlowExecution).isEmpty()) { workFlowContinuationServiceImpl.continueWorkFlow(projectId, userId, mainWorkFlowName, workContext, mainWorkFlowExecution.getId(), Optional.ofNullable(mainWorkFlowExecution.getWorkFlowDefinition().getRollbackWorkFlowDefinition()) .map(WorkFlowDefinition::getName).orElse(null)); + } } } diff --git a/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/aspect/WorkFlowTaskExecutionAspect.java b/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/aspect/WorkFlowTaskExecutionAspect.java index 5f083abfd..438fd47fc 100644 --- a/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/aspect/WorkFlowTaskExecutionAspect.java +++ b/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/aspect/WorkFlowTaskExecutionAspect.java @@ -129,8 +129,9 @@ else if (WorkStatus.FAILED != workFlowTaskExecution.getStatus()) { } try { report = (WorkReport) proceedingJoinPoint.proceed(); - if (report == null || report.getStatus() == null) + if (report == null || report.getStatus() == null) { throw new NullPointerException("task execution not returns status: " + workFlowTaskName); + } } catch (Throwable e) { log.error("Workflow task execution {} has failed! error message: {}", workFlowTaskName, e.getMessage()); diff --git a/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/scheduler/WorkFlowSchedulerServiceImpl.java b/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/scheduler/WorkFlowSchedulerServiceImpl.java index 82d06392a..d495d4f74 100644 --- a/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/scheduler/WorkFlowSchedulerServiceImpl.java +++ b/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/scheduler/WorkFlowSchedulerServiceImpl.java @@ -76,8 +76,9 @@ public boolean stop(UUID projectId, UUID userId, WorkFlow workFlow) { boolean stopped = hm.get(new ScheduledTaskKey(projectId, userId)).get(workFlow.getName()).cancel(false); if (stopped) { hm.get(new ScheduledTaskKey(projectId, userId)).remove(workFlow.getName()); - if (hm.get(new ScheduledTaskKey(projectId, userId)).isEmpty()) + if (hm.get(new ScheduledTaskKey(projectId, userId)).isEmpty()) { hm.remove(new ScheduledTaskKey(projectId, userId)); + } } return stopped; } diff --git a/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/service/WorkFlowServiceDelegate.java b/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/service/WorkFlowServiceDelegate.java index 7a17602fe..fb4f072a8 100644 --- a/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/service/WorkFlowServiceDelegate.java +++ b/workflow-service/src/main/java/com/redhat/parodos/workflow/execution/service/WorkFlowServiceDelegate.java @@ -110,12 +110,14 @@ private void buildWorkFlowStatusDTO(WorkFlowExecution workFlowExecution, WorkFlo List workFlowWorkDefinitions = workFlowWorkRepository .findByWorkFlowDefinitionIdOrderByCreateDateAsc(workFlowDefinition.getId()); workFlowWorkDefinitions.forEach(workFlowWorkDefinition -> { - if (workFlowWorkDefinition.getWorkDefinitionType().equals(WorkType.WORKFLOW)) + if (workFlowWorkDefinition.getWorkDefinitionType().equals(WorkType.WORKFLOW)) { workStatusResponseDTOList .add(getWorkStatusResponseDTOFromWorkFlow(workFlowWorkDefinition, workFlowExecution)); - else + } + else { workStatusResponseDTOList .add(getWorkStatusResponseDTOFromWorkFlowTask(workFlowWorkDefinition, workFlowExecution)); + } }); } @@ -131,12 +133,14 @@ private void buildWorkFlowWorksStatusDTO(String workFlowName, WorkFlowExecution .findByWorkFlowDefinitionIdOrderByCreateDateAsc(workFlowExecution.getWorkFlowDefinition().getId()); workFlowWorksDefinitions.forEach(workFlowWorkDefinition -> { - if (workFlowWorkDefinition.getWorkDefinitionType().equals(WorkType.WORKFLOW)) + if (workFlowWorkDefinition.getWorkDefinitionType().equals(WorkType.WORKFLOW)) { workStatusResponseDTOList .add(getWorkStatusResponseDTOFromWorkFlow(workFlowWorkDefinition, mainWorkFlowExecution)); - else + } + else { workStatusResponseDTOList .add(getWorkStatusResponseDTOFromWorkFlowTask(workFlowWorkDefinition, workFlowExecution)); + } }); } diff --git a/workflow-service/src/main/java/com/redhat/parodos/workflow/registry/BeanWorkFlowRegistryImpl.java b/workflow-service/src/main/java/com/redhat/parodos/workflow/registry/BeanWorkFlowRegistryImpl.java index 4bbfd1bc7..6cc507a3e 100644 --- a/workflow-service/src/main/java/com/redhat/parodos/workflow/registry/BeanWorkFlowRegistryImpl.java +++ b/workflow-service/src/main/java/com/redhat/parodos/workflow/registry/BeanWorkFlowRegistryImpl.java @@ -170,10 +170,12 @@ private Pair> getWorkFlowTypeDetails(String wo private WorkFlowProcessingType getWorkFlowProcessingType(Object workFlowBean) { String className = workFlowBean.getClass().getTypeName(); - if (className.toUpperCase().contains(WorkFlowProcessingType.PARALLEL.name())) + if (className.toUpperCase().contains(WorkFlowProcessingType.PARALLEL.name())) { return WorkFlowProcessingType.PARALLEL; - if (className.toUpperCase().contains(WorkFlowProcessingType.SEQUENTIAL.name())) + } + if (className.toUpperCase().contains(WorkFlowProcessingType.SEQUENTIAL.name())) { return WorkFlowProcessingType.SEQUENTIAL; + } return WorkFlowProcessingType.OTHER; } diff --git a/workflow-service/src/main/java/com/redhat/parodos/workflow/util/WorkFlowDTOUtil.java b/workflow-service/src/main/java/com/redhat/parodos/workflow/util/WorkFlowDTOUtil.java index 097d28823..07f64c971 100644 --- a/workflow-service/src/main/java/com/redhat/parodos/workflow/util/WorkFlowDTOUtil.java +++ b/workflow-service/src/main/java/com/redhat/parodos/workflow/util/WorkFlowDTOUtil.java @@ -37,6 +37,9 @@ @Slf4j public class WorkFlowDTOUtil { + private WorkFlowDTOUtil() { + } + public static Map convertArgumentListToMap( List argumentRequestDTOList) { return argumentRequestDTOList.stream() 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 14f9a3855..73a0605ad 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 @@ -14,7 +14,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; class WorkFlowPropertiesAspectTest { diff --git a/workflow-service/src/test/java/com/redhat/parodos/workflow/registry/BeanWorkFlowRegistryImplTest.java b/workflow-service/src/test/java/com/redhat/parodos/workflow/registry/BeanWorkFlowRegistryImplTest.java index 5f861a10e..49e15a94b 100644 --- a/workflow-service/src/test/java/com/redhat/parodos/workflow/registry/BeanWorkFlowRegistryImplTest.java +++ b/workflow-service/src/test/java/com/redhat/parodos/workflow/registry/BeanWorkFlowRegistryImplTest.java @@ -18,7 +18,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyList; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.nullable; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; class BeanWorkFlowRegistryImplTest {