Fixing issues after merging

OHDSI · Nov 21, 2024 · 20e240a · 20e240a
1 parent 1637ad9
commit 20e240a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
 
     <commons-fileupload.version>1.5</commons-fileupload.version>
 
-    <circe.version>1.11.2</circe.version>
+    <circe.version>1.11.4-SNAPSHOT</circe.version>
     <jersey.version>2.14</jersey.version>
     <SqlRender.version>1.16.1</SqlRender.version>
     <hive-jdbc.version>3.1.2</hive-jdbc.version>

diff --git 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
@@ -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
@@ -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());
   }