From 781e0a25466fe6ca800bb961c2f59552a01b821b Mon Sep 17 00:00:00 2001
From: edwincruz <ecruz165@yahoo.com>
Date: Thu, 23 Feb 2023 22:51:56 -0500
Subject: [PATCH] Refactored imports to depend on independent guava lib already
 loaded as a child dependency.

---
 .../service/ScriptExecutionServiceImpl.java            |  4 ++--
 .../ohdsi/webapi/service/CohortAnalysisService.java    | 10 +---------
 src/main/java/org/ohdsi/webapi/source/Source.java      |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/ohdsi/webapi/executionengine/service/ScriptExecutionServiceImpl.java b/src/main/java/org/ohdsi/webapi/executionengine/service/ScriptExecutionServiceImpl.java
index 4de58c24ee..573b7df988 100644
--- a/src/main/java/org/ohdsi/webapi/executionengine/service/ScriptExecutionServiceImpl.java
+++ b/src/main/java/org/ohdsi/webapi/executionengine/service/ScriptExecutionServiceImpl.java
@@ -7,8 +7,8 @@
 import java.nio.file.Path;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import jersey.repackaged.com.google.common.collect.ImmutableList;
-import jersey.repackaged.com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import net.lingala.zip4j.ZipFile;
 import net.lingala.zip4j.exception.ZipException;
 import net.lingala.zip4j.model.FileHeader;
diff --git a/src/main/java/org/ohdsi/webapi/service/CohortAnalysisService.java b/src/main/java/org/ohdsi/webapi/service/CohortAnalysisService.java
index d9131808b2..7e085ed557 100644
--- a/src/main/java/org/ohdsi/webapi/service/CohortAnalysisService.java
+++ b/src/main/java/org/ohdsi/webapi/service/CohortAnalysisService.java
@@ -4,7 +4,6 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -18,27 +17,20 @@
 import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import jersey.repackaged.com.google.common.base.Joiner;
+import com.google.common.base.Joiner;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.ohdsi.sql.SqlRender;
 import org.ohdsi.sql.SqlSplit;
-import org.ohdsi.sql.SqlTranslate;
-import org.ohdsi.circe.helper.ResourceHelper;
 import org.ohdsi.webapi.cohortanalysis.*;
 import org.ohdsi.webapi.cohortdefinition.CohortDefinition;
 import org.ohdsi.webapi.cohortdefinition.CohortDefinitionRepository;
-import org.ohdsi.webapi.cohortresults.PeriodType;
 import org.ohdsi.webapi.cohortresults.VisualizationDataRepository;
 import org.ohdsi.webapi.job.GeneratesNotification;
 import org.ohdsi.webapi.job.JobExecutionResource;
 import org.ohdsi.webapi.job.JobTemplate;
 import org.ohdsi.webapi.model.results.Analysis;
 import org.ohdsi.webapi.source.Source;
-import org.ohdsi.webapi.source.SourceDaimon;
 import org.ohdsi.webapi.util.PreparedStatementRenderer;
 import org.ohdsi.webapi.util.SessionUtils;
-import org.ohdsi.webapi.util.SourceUtils;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/org/ohdsi/webapi/source/Source.java b/src/main/java/org/ohdsi/webapi/source/Source.java
index b098077f69..bbff30fd9d 100644
--- a/src/main/java/org/ohdsi/webapi/source/Source.java
+++ b/src/main/java/org/ohdsi/webapi/source/Source.java
@@ -32,7 +32,7 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import jersey.repackaged.com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Parameter;
 import org.hibernate.annotations.SQLDelete;