diff --git a/pom.xml b/pom.xml index f82a63ccb..be957db83 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 1.5 - 1.11.2 + 1.11.4-SNAPSHOT 2.14 1.16.1 3.1.2 diff --git a/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortGenerationRequestBuilder.java b/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortGenerationRequestBuilder.java index b88a66148..a958d49ee 100644 --- a/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortGenerationRequestBuilder.java +++ b/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortGenerationRequestBuilder.java @@ -71,6 +71,7 @@ public CohortGenerationRequest buildWithRetainCohortCovariates() { return new CohortGenerationRequest(expression, source, sessionId, targetId, targetSchema, retainCohortCovariates, cohortId); + } public boolean hasRetainCohortCovariates() { return retainCohortCovariates != null ? retainCohortCovariates.booleanValue() : false; diff --git a/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortGenerationUtils.java b/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortGenerationUtils.java index 544a2e7c2..2bdfbf0f9 100644 --- a/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortGenerationUtils.java +++ b/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortGenerationUtils.java @@ -12,7 +12,6 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.util.ObjectUtils; - import java.util.Arrays; import java.util.List; diff --git a/src/main/java/org/ohdsi/webapi/service/CohortGenerationService.java b/src/main/java/org/ohdsi/webapi/service/CohortGenerationService.java index df5abfd3c..8f9964fc2 100644 --- a/src/main/java/org/ohdsi/webapi/service/CohortGenerationService.java +++ b/src/main/java/org/ohdsi/webapi/service/CohortGenerationService.java @@ -90,7 +90,7 @@ public JobExecutionResource generateCohortViaJob(UserEntity userEntity, CohortDe return runGenerateCohortJob(cohortDefinition, source, retainCohortCovariates); } - private Job buildGenerateCohortJob(CohortDefinition cohortDefinition, Source source, JobParameters jobParameters, Boolean retainCohortCovariates) { + private Job buildGenerateCohortJob(CohortDefinition cohortDefinition, Source source, JobParameters jobParameters) { log.info("Beginning generate cohort for cohort definition id: {}", cohortDefinition.getId()); @@ -124,7 +124,7 @@ private Job buildGenerateCohortJob(CohortDefinition cohortDefinition, Source sou private JobExecutionResource runGenerateCohortJob(CohortDefinition cohortDefinition, Source source, Boolean retainCohortCovariates) { final JobParametersBuilder jobParametersBuilder = getJobParametersBuilder(source, cohortDefinition, retainCohortCovariates); - Job job = buildGenerateCohortJob(cohortDefinition, source, jobParametersBuilder.toJobParameters(), retainCohortCovariates); + Job job = buildGenerateCohortJob(cohortDefinition, source, jobParametersBuilder.toJobParameters()); return jobService.runJob(job, jobParametersBuilder.toJobParameters()); }