From 20e240a201dcbced87934f2d36a48b0cfa400fe7 Mon Sep 17 00:00:00 2001
From: alex-odysseus <alexey.manoylenko@odysseusinc.com>
Date: Thu, 21 Nov 2024 19:44:25 +0100
Subject: [PATCH] Fixing issues after merging

---
 pom.xml                                                       | 2 +-
 .../cohortdefinition/CohortGenerationRequestBuilder.java      | 1 +
 .../ohdsi/webapi/cohortdefinition/CohortGenerationUtils.java  | 1 -
 .../org/ohdsi/webapi/service/CohortGenerationService.java     | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f82a63ccb..be957db83 100644
--- 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
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());
   }