Fixed compilation issues after rebase

Author: oleg-odysseus

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

@@ -1126,7 +1126,7 @@ public InclusionRuleReport getInclusionRuleReport(
         report.treemapData = treemapData;
 
         if (DEMOGRAPHIC_MODE == modeId) {
-            if (ccGenerateId != null && ccGenerateId != "null") {
+            if (ccGenerateId != null && (!ccGenerateId.equals("null"))) {
                 List<Report> listDemoDetail = getDemographicStatistics(whitelist(id), source, modeId,
                         Long.valueOf(ccGenerateId));
 

src/main/java/org/ohdsi/webapi/shiny/CohortCountsShinyPackagingService.java

@@ -87,8 +87,8 @@ public void populateAppData(Integer generationId, String sourceKey, ShinyAppData
 
         dataConsumers.getTextFiles().accept("cohort_summary_markdown.txt", cohortSummaryAsMarkdown);
 
-        InclusionRuleReport byEventReport = cohortDefinitionService.getInclusionRuleReport(generationId, sourceKey, 0); //by event
-        InclusionRuleReport byPersonReport = cohortDefinitionService.getInclusionRuleReport(generationId, sourceKey, 1); //by person
+        InclusionRuleReport byEventReport = cohortDefinitionService.getInclusionRuleReport(generationId, sourceKey, 0, null); //by event
+        InclusionRuleReport byPersonReport = cohortDefinitionService.getInclusionRuleReport(generationId, sourceKey, 1, null); //by person
 
         dataConsumers.getJsonObjects().accept(sourceKey + "_by_event.json", byEventReport);
         dataConsumers.getJsonObjects().accept(sourceKey + "_by_person.json", byPersonReport);

src/main/java/org/ohdsi/webapi/shiny/posit/TagMapper.java

@@ -7,13 +7,13 @@
 @Service
 public class TagMapper {
 
-    @Value("${shiny.tag.name.analysis.cohort}")
+    @Value("${shiny.tag.name.analysis.cohort:Atlas Cohort}")
     private String cohortAnalysisTagName;
-    @Value("${shiny.tag.name.analysis.cohort-characterizations}")
+    @Value("${shiny.tag.name.analysis.cohort-characterizations:Atlas Cohort Characterization}")
     private String cohortCharacterizationsAnalysisTagName;
-    @Value("${shiny.tag.name.analysis.cohort-pathways}")
+    @Value("${shiny.tag.name.analysis.cohort-pathways:Atlas Cohort Pathways}")
     private String cohortPathwaysAnalysisTagName;
-    @Value("${shiny.tag.name.analysis.incidence-rates}")
+    @Value("${shiny.tag.name.analysis.incidence-rates:Atlas Incidence Rate Analysis}")
     private String incidenceRatesAnalysisTagName;
 
     public String getPositTagNameForAnalysisType(CommonAnalysisType analysisType) {