Skip to content

Commit b5c5661

Browse files
author
Edwin Cruz
authored
Refactored imports to depend on independent guava lib already loaded as a child dependency. (#2219)
1 parent 680aba1 commit b5c5661

3 files changed

Lines changed: 4 additions & 12 deletions

File tree

src/main/java/org/ohdsi/webapi/executionengine/service/ScriptExecutionServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import java.nio.file.Path;
88
import java.util.Optional;
99
import java.util.stream.Collectors;
10-
import jersey.repackaged.com.google.common.collect.ImmutableList;
11-
import jersey.repackaged.com.google.common.collect.ImmutableMap;
10+
import com.google.common.collect.ImmutableList;
11+
import com.google.common.collect.ImmutableMap;
1212
import net.lingala.zip4j.ZipFile;
1313
import net.lingala.zip4j.exception.ZipException;
1414
import net.lingala.zip4j.model.FileHeader;

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import java.sql.ResultSet;
66
import java.sql.SQLException;
7-
import java.util.Arrays;
87
import java.util.Calendar;
98
import java.util.List;
109
import java.util.stream.Collectors;
@@ -18,27 +17,20 @@
1817
import javax.ws.rs.core.MediaType;
1918

2019
import com.fasterxml.jackson.databind.ObjectMapper;
21-
import jersey.repackaged.com.google.common.base.Joiner;
20+
import com.google.common.base.Joiner;
2221

23-
import org.apache.commons.collections.CollectionUtils;
24-
import org.ohdsi.sql.SqlRender;
2522
import org.ohdsi.sql.SqlSplit;
26-
import org.ohdsi.sql.SqlTranslate;
27-
import org.ohdsi.circe.helper.ResourceHelper;
2823
import org.ohdsi.webapi.cohortanalysis.*;
2924
import org.ohdsi.webapi.cohortdefinition.CohortDefinition;
3025
import org.ohdsi.webapi.cohortdefinition.CohortDefinitionRepository;
31-
import org.ohdsi.webapi.cohortresults.PeriodType;
3226
import org.ohdsi.webapi.cohortresults.VisualizationDataRepository;
3327
import org.ohdsi.webapi.job.GeneratesNotification;
3428
import org.ohdsi.webapi.job.JobExecutionResource;
3529
import org.ohdsi.webapi.job.JobTemplate;
3630
import org.ohdsi.webapi.model.results.Analysis;
3731
import org.ohdsi.webapi.source.Source;
38-
import org.ohdsi.webapi.source.SourceDaimon;
3932
import org.ohdsi.webapi.util.PreparedStatementRenderer;
4033
import org.ohdsi.webapi.util.SessionUtils;
41-
import org.ohdsi.webapi.util.SourceUtils;
4234
import org.springframework.batch.core.JobParameters;
4335
import org.springframework.batch.core.JobParametersBuilder;
4436
import org.springframework.beans.factory.annotation.Value;

src/main/java/org/ohdsi/webapi/source/Source.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import javax.persistence.OneToMany;
3333
import javax.persistence.Table;
3434

35-
import jersey.repackaged.com.google.common.collect.ImmutableList;
35+
import com.google.common.collect.ImmutableList;
3636
import org.hibernate.annotations.GenericGenerator;
3737
import org.hibernate.annotations.Parameter;
3838
import org.hibernate.annotations.SQLDelete;

0 commit comments

Comments
 (0)