Skip to content

Commit e5151a8

Browse files
Daniel Silvaclaude
authored andcommitted
refactor(deps): fix repackaged Guava imports in dotcms-integration tests (refs #35235)
18 integration test files in dotcms-integration/src/test/java were missed in the initial migration. Replace all remaining com.dotcms.repackage.com.google.* imports with standard com.google.* equivalents. Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
1 parent 35aa829 commit e5151a8

18 files changed

Lines changed: 19 additions & 19 deletions

dotcms-integration/src/test/java/com/dotcms/contenttype/test/ContentTypeImportExportTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.junit.Test;
55

66
import com.dotcms.contenttype.util.ContentTypeImportExportUtil;
7-
import com.dotcms.repackage.com.google.common.io.Files;
7+
import com.google.common.io.Files;
88

99
public class ContentTypeImportExportTest extends ContentTypeBaseTest {
1010

dotcms-integration/src/test/java/com/dotcms/contenttype/test/FieldFactoryImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import com.dotmarketing.exception.DotSecurityException;
4646
import com.dotmarketing.portlets.contentlet.model.Contentlet;
4747
import com.google.common.collect.ImmutableList;
48-
import com.dotcms.repackage.com.google.common.collect.ImmutableMap;
48+
import com.google.common.collect.ImmutableMap;
4949
import com.dotmarketing.beans.Host;
5050
import com.dotmarketing.business.APILocator;
5151
import com.dotmarketing.business.FactoryLocator;

dotcms-integration/src/test/java/com/dotcms/datagen/TemplateDataGen.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import static com.dotmarketing.business.ModDateTestUtil.updateTemplateVersionDate;
77

88
import com.dotcms.business.WrapInTransaction;
9-
import com.dotcms.repackage.com.google.common.base.Strings;
10-
import com.dotcms.repackage.com.google.common.collect.ImmutableMap;
9+
import com.google.common.base.Strings;
10+
import com.google.common.collect.ImmutableMap;
1111
import com.dotmarketing.beans.Host;
1212
import com.dotmarketing.business.APILocator;
1313
import com.dotmarketing.exception.DotDataException;

dotcms-integration/src/test/java/com/dotcms/integritycheckers/IntegrityUtilTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.dotcms.datagen.SiteDataGen;
1515
import com.dotcms.datagen.TemplateDataGen;
1616
import com.dotcms.repackage.com.csvreader.CsvWriter;
17-
import com.dotcms.repackage.com.google.common.io.Files;
17+
import com.google.common.io.Files;
1818
import com.dotcms.util.IntegrationTestInitService;
1919
import com.dotmarketing.beans.Host;
2020
import com.dotmarketing.beans.Identifier;

dotcms-integration/src/test/java/com/dotcms/visitor/filter/characteristics/VisitorCharacterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.when;
66

7-
import com.dotcms.repackage.com.google.common.collect.Lists;
7+
import com.google.common.collect.Lists;
88
import com.dotcms.unittest.TestUtil;
99
import com.dotcms.util.IntegrationTestInitService;
1010
import com.dotcms.visitor.filter.servlet.VisitorFilter;

dotcms-integration/src/test/java/com/dotmarketing/portlets/contentlet/transform/ContentletTransformerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.dotcms.datagen.SiteDataGen;
2222
import com.dotcms.datagen.TestDataUtils;
2323
import com.dotcms.datagen.TestDataUtils.TestFile;
24-
import com.dotcms.repackage.com.google.common.io.Files;
24+
import com.google.common.io.Files;
2525
import com.dotcms.rest.ContentHelper;
2626
import com.dotcms.rest.MapToContentletPopulator;
2727
import com.dotcms.util.IntegrationTestInitService;

dotcms-integration/src/test/java/com/dotmarketing/portlets/rules/conditionlet/ConditionletTestUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.dotmarketing.portlets.rules.conditionlet;
22

3-
import com.dotcms.repackage.com.google.common.collect.Lists;
3+
import com.google.common.collect.Lists;
44
import com.dotmarketing.portlets.rules.ParameterDataGen;
55
import com.dotmarketing.portlets.rules.RuleDataGen;
66
import com.dotmarketing.portlets.rules.actionlet.RuleActionDataGen;

dotcms-integration/src/test/java/com/dotmarketing/portlets/workflows/actionlet/CopyActionletTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.dotcms.contenttype.model.type.ContentType;
1010
import com.dotcms.contenttype.model.type.ContentTypeBuilder;
1111
import com.dotcms.contenttype.transform.contenttype.StructureTransformer;
12-
import com.dotcms.repackage.com.google.common.collect.ImmutableMap;
12+
import com.google.common.collect.ImmutableMap;
1313
import com.dotcms.system.event.local.model.EventSubscriber;
1414
import com.dotcms.util.IntegrationTestInitService;
1515
import com.dotmarketing.beans.Host;

dotcms-integration/src/test/java/com/dotmarketing/portlets/workflows/actionlet/copy/AbstractContentletValidationStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import static org.junit.Assert.assertNotEquals;
55
import static org.junit.Assert.assertTrue;
66

7-
import com.dotcms.repackage.com.google.common.collect.ImmutableMap;
7+
import com.google.common.collect.ImmutableMap;
88
import org.apache.commons.io.FilenameUtils;
99
import com.dotmarketing.exception.DotDataException;
1010
import com.dotmarketing.portlets.contentlet.model.Contentlet;

dotcms-integration/src/test/java/com/dotmarketing/portlets/workflows/actionlet/copy/ContentValidationStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static org.junit.Assert.assertEquals;
44

5-
import com.dotcms.repackage.com.google.common.collect.ImmutableMap;
5+
import com.google.common.collect.ImmutableMap;
66
import com.dotmarketing.portlets.contentlet.model.Contentlet;
77
import java.util.Map;
88

0 commit comments

Comments
 (0)