Getting rid of the other features leftovers after merging

Author: alex-odysseus

src/main/java/org/ohdsi/webapi/cohortdefinition/CohortGenerationRequestBuilder.java

@@ -34,7 +34,7 @@ public CohortGenerationRequestBuilder withTargetId(Integer targetId) {
         this.targetId = targetId;
         return this;
     }
-    }
+
     public CohortGenerationRequest build() {
 
         if (this.source == null || this.expression == null || this.targetId == null) {

src/main/java/org/ohdsi/webapi/cohortdefinition/GenerateCohortTasklet.java

@@ -21,7 +21,6 @@
 import org.ohdsi.sql.SqlRender;
 import org.ohdsi.sql.SqlSplit;
 import org.ohdsi.sql.SqlTranslate;
-import org.ohdsi.webapi.cohortcharacterization.domain.CcFeAnalysisEntity;
 import org.ohdsi.webapi.cohortcharacterization.domain.CohortCharacterizationEntity;
 import org.ohdsi.webapi.common.generation.CancelableTasklet;
 import org.ohdsi.webapi.common.generation.GenerationUtils;
@@ -114,14 +113,14 @@ private String[] prepareQueriesDemographic(ChunkContext chunkContext, Cancelable
       // Get FE Analysis Demographic (Gender, Age, Race,)
       Set<FeAnalysisEntity> feAnalysis = feAnalysisRepository.findByListIds(Arrays.asList(70, 72, 74, 77));
 
-      Set<CcFeAnalysisEntity> ccFeAnalysis = feAnalysis.stream().map(a -> {
-          CcFeAnalysisEntity ccA = new CcFeAnalysisEntity();
-          ccA.setCohortCharacterization(cohortCharacterization);
-          ccA.setFeatureAnalysis(a);
-          return ccA;
-      }).collect(Collectors.toSet());
+//      Set<CcFeAnalysisEntity> ccFeAnalysis = feAnalysis.stream().map(a -> {
+//          CcFeAnalysisEntity ccA = new CcFeAnalysisEntity();
+//          ccA.setCohortCharacterization(cohortCharacterization);
+//          ccA.setFeatureAnalysis(a);
+//          return ccA;
+//      }).collect(Collectors.toSet());
 
-      cohortCharacterization.setFeatureAnalyses(ccFeAnalysis);
+      cohortCharacterization.setFeatureAnalyses(feAnalysis);
 
       final Long jobId = chunkContext.getStepContext().getStepExecution().getJobExecution().getId();
 
@@ -138,7 +137,7 @@ private String[] prepareQueriesDemographic(ChunkContext chunkContext, Cancelable
 
       CCQueryBuilder ccQueryBuilder = new CCQueryBuilder(cohortCharacterization, cohortTable, sessionId,
               SourceUtils.getCdmQualifier(source), SourceUtils.getResultsQualifier(source),
-              SourceUtils.getVocabularyQualifier(source), tempSchema, jobId, includeAnnual, includeTemporal);
+              SourceUtils.getVocabularyQualifier(source), tempSchema, jobId);
       String sql = ccQueryBuilder.build();
 
       /*

src/main/java/org/ohdsi/webapi/service/CohortGenerationService.java

@@ -118,7 +118,8 @@ public JobExecutionResource generateCohortViaJob(UserEntity userEntity, CohortDe
       // as a lot of components are instantiated by the new operator
       cohortDefinition.getDetails().getExpression();
 
-      return runGenerateCohortJob(cohortDefinition, source, demographicStat);  }
+      return runGenerateCohortJob(cohortDefinition, source, demographicStat);
+  }
 
   private Job buildGenerateCohortJob(CohortDefinition cohortDefinition, Source source, JobParameters jobParameters) {
 
@@ -206,27 +207,19 @@ public Job buildJobForCohortGenerationWithDemographic(
       return generateJobBuilder.build();
   }
 
-  private JobExecutionResource runGenerateCohortJob(CohortDefinition cohortDefinition, Source source, Boolean retainCohortCovariates) {
-    final JobParametersBuilder jobParametersBuilder = getJobParametersBuilder(source, cohortDefinition, retainCohortCovariates);
-    Job job = buildGenerateCohortJob(cohortDefinition, source, jobParametersBuilder.toJobParameters());
-    return jobService.runJob(job, jobParametersBuilder.toJobParameters());
-
   protected void addSessionParams(JobParametersBuilder builder, String sessionId) {
       builder.addString(TARGET_TABLE, GenerationUtils.getTempCohortTableName(sessionId));
   }
 
-  private JobExecutionResource runGenerateCohortJob(CohortDefinition cohortDefinition, Source source) {
-      return runGenerateCohortJob(cohortDefinition, source, null);
-  }
-
   private JobExecutionResource runGenerateCohortJob(CohortDefinition cohortDefinition, Source source,
           Boolean demographic) {
       final JobParametersBuilder jobParametersBuilder = getJobParametersBuilder(source, cohortDefinition);
 
       if (demographic != null && demographic) {
          jobParametersBuilder.addString(DEMOGRAPHIC_STATS, Boolean.TRUE.toString());
          Job job = buildJobForCohortGenerationWithDemographic(cohortDefinition, source, jobParametersBuilder);
-         return jobService.runJob(job, jobParametersBuilder.toJobParameters());      } else {
+         return jobService.runJob(job, jobParametersBuilder.toJobParameters());
+      } else {
           Job job = buildGenerateCohortJob(cohortDefinition, source, jobParametersBuilder.toJobParameters());
           return jobService.runJob(job, jobParametersBuilder.toJobParameters());
       }