Skip to content

Commit 28ac9af

Browse files
yahaviyahavi
authored
Remove Guava (#793)
1 parent 90c7fcb commit 28ac9af

File tree

35 files changed

+243
-397
lines changed

35 files changed

+243
-397
lines changed

‎build-info-client/src/main/java/org/jfrog/build/client/DeployableArtifactDetail.java

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.jfrog.build.client;
22

3-
import com.google.common.collect.ArrayListMultimap;
4-
53
import java.io.Serializable;
64
import java.util.Collection;
75
import java.util.Map;

‎build-info-extractor-docker/src/main/java/org/jfrog/build/extractor/docker/extractor/BuildDockerCreator.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
import com.fasterxml.jackson.databind.JsonNode;
44
import com.fasterxml.jackson.databind.ObjectMapper;
5-
import com.google.common.collect.ArrayListMultimap;
5+
import org.apache.commons.collections4.MultiValuedMap;
6+
import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
67
import org.apache.commons.lang3.StringUtils;
78
import org.apache.commons.lang3.exception.ExceptionUtils;
9+
import org.jfrog.build.api.util.Log;
810
import org.jfrog.build.extractor.ci.BuildInfo;
911
import org.jfrog.build.extractor.ci.Module;
10-
import org.jfrog.build.api.util.Log;
1112
import org.jfrog.build.extractor.clientConfiguration.ArtifactoryClientConfiguration;
1213
import org.jfrog.build.extractor.clientConfiguration.ArtifactoryManagerBuilder;
1314
import org.jfrog.build.extractor.clientConfiguration.client.artifactory.ArtifactoryManager;
@@ -34,7 +35,7 @@
3435
import static org.jfrog.build.extractor.packageManager.PackageManagerUtils.createArtifactoryClientConfiguration;
3536

3637
public class BuildDockerCreator extends PackageManagerExtractor {
37-
private final ArrayListMultimap<String, String> artifactProperties;
38+
private final MultiValuedMap<String, String> artifactProperties;
3839
private final ArtifactoryManagerBuilder artifactoryManagerBuilder;
3940
private final ImageFileType imageFileType;
4041
private final String sourceRepo;
@@ -55,7 +56,7 @@ enum ImageFileType {
5556
* @param artifactProperties - Properties to be attached to the docker layers deployed to Artifactory.
5657
*/
5758
public BuildDockerCreator(ArtifactoryManagerBuilder artifactoryManagerBuilder, String imageFile, ImageFileType imageFileType,
58-
ArrayListMultimap<String, String> artifactProperties, String sourceRepo, Log logger) {
59+
MultiValuedMap<String, String> artifactProperties, String sourceRepo, Log logger) {
5960
this.artifactoryManagerBuilder = artifactoryManagerBuilder;
6061
this.artifactProperties = artifactProperties;
6162
this.sourceRepo = sourceRepo;
@@ -91,7 +92,7 @@ public static void main(String[] ignored) {
9192
BuildDockerCreator dockerBuildCreate = new BuildDockerCreator(artifactoryManagerBuilder,
9293
imageFile,
9394
imageFileType,
94-
ArrayListMultimap.create(clientConfiguration.publisher.getMatrixParams().asMultimap()),
95+
new ArrayListValuedHashMap<>(clientConfiguration.publisher.getMatrixParams()),
9596
clientConfiguration.publisher.getRepoKey(),
9697
clientConfiguration.getLog());
9798

@@ -136,7 +137,7 @@ public BuildInfo execute() {
136137
/**
137138
* Update each layer's properties with artifactProperties.
138139
*/
139-
private void setImageLayersProps(DockerLayers layers, ArrayListMultimap<String, String> artifactProperties, ArtifactoryManagerBuilder artifactoryManagerBuilder) throws IOException {
140+
private void setImageLayersProps(DockerLayers layers, MultiValuedMap<String, String> artifactProperties, ArtifactoryManagerBuilder artifactoryManagerBuilder) throws IOException {
140141
if (layers == null) {
141142
return;
142143
}

‎build-info-extractor-docker/src/main/java/org/jfrog/build/extractor/docker/extractor/DockerPush.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package org.jfrog.build.extractor.docker.extractor;
22

3-
import com.google.common.collect.ArrayListMultimap;
3+
import org.apache.commons.collections4.MultiValuedMap;
4+
import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
45
import org.apache.commons.lang3.StringUtils;
56
import org.apache.commons.lang3.exception.ExceptionUtils;
7+
import org.jfrog.build.api.util.Log;
68
import org.jfrog.build.extractor.ci.BuildInfo;
79
import org.jfrog.build.extractor.ci.Module;
8-
import org.jfrog.build.api.util.Log;
910
import org.jfrog.build.extractor.clientConfiguration.ArtifactoryClientConfiguration;
1011
import org.jfrog.build.extractor.clientConfiguration.ArtifactoryManagerBuilder;
1112
import org.jfrog.build.extractor.clientConfiguration.client.artifactory.ArtifactoryManager;
@@ -21,7 +22,7 @@
2122
import static org.jfrog.build.extractor.packageManager.PackageManagerUtils.createArtifactoryClientConfiguration;
2223

2324
public class DockerPush extends DockerCommand {
24-
private final ArrayListMultimap<String, String> artifactProperties;
25+
private final MultiValuedMap<String, String> artifactProperties;
2526

2627

2728
/**
@@ -36,7 +37,7 @@ public class DockerPush extends DockerCommand {
3637
* @param env - Environment variables to use during docker push execution.
3738
*/
3839
public DockerPush(ArtifactoryManagerBuilder artifactoryManagerBuilder,
39-
String imageTag, String host, ArrayListMultimap<String, String> artifactProperties, String targetRepository, String username,
40+
String imageTag, String host, MultiValuedMap<String, String> artifactProperties, String targetRepository, String username,
4041
String password, Log logger, Map<String, String> env) {
4142
super(artifactoryManagerBuilder, imageTag, host, targetRepository, username, password, logger, env);
4243
this.artifactProperties = artifactProperties;
@@ -58,7 +59,7 @@ public static void main(String[] ignored) {
5859
DockerPush dockerPush = new DockerPush(artifactoryManagerBuilder,
5960
dockerHandler.getImageTag(),
6061
dockerHandler.getHost(),
61-
ArrayListMultimap.create(clientConfiguration.publisher.getMatrixParams().asMultimap()),
62+
new ArrayListValuedHashMap<>(clientConfiguration.publisher.getMatrixParams()),
6263
clientConfiguration.publisher.getRepoKey(),
6364
clientConfiguration.publisher.getUsername(),
6465
clientConfiguration.publisher.getPassword(),
@@ -85,7 +86,7 @@ public BuildInfo execute() {
8586
String imageId = DockerJavaWrapper.getImageIdFromTag(imageTag, host, env, logger);
8687
DockerImage image = new DockerImage(imageId, imageTag, "", targetRepository, artifactoryManagerBuilder, "", "");
8788
Module module = image.generateBuildInfoModule(logger, DockerUtils.CommandType.Push);
88-
if (module.getArtifacts() == null || module.getArtifacts().size() == 0) {
89+
if (module.getArtifacts() == null || module.getArtifacts().isEmpty()) {
8990
logger.warn("Could not find docker image: " + imageTag + " in Artifactory.");
9091
} else {
9192
setImageLayersProps(image.getLayers(), artifactProperties, artifactoryManagerBuilder);
@@ -104,7 +105,7 @@ public BuildInfo execute() {
104105
/**
105106
* Update each layer's properties with artifactProperties.
106107
*/
107-
private void setImageLayersProps(DockerLayers layers, ArrayListMultimap<String, String> artifactProperties, ArtifactoryManagerBuilder artifactoryManagerBuilder) throws IOException {
108+
private void setImageLayersProps(DockerLayers layers, MultiValuedMap<String, String> artifactProperties, ArtifactoryManagerBuilder artifactoryManagerBuilder) throws IOException {
108109
if (layers == null) {
109110
return;
110111
}

‎build-info-extractor-docker/src/test/java/org/jfrog/build/extractor/docker/extractor/DockerExtractorTest.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import com.fasterxml.jackson.databind.node.ObjectNode;
5-
import com.google.common.collect.ArrayListMultimap;
6-
import com.google.common.collect.ImmutableMultimap;
7-
import com.google.common.collect.Lists;
8-
import com.google.common.collect.Sets;
5+
import org.apache.commons.collections4.MultiValuedMap;
6+
import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
7+
import org.apache.commons.compress.utils.Sets;
98
import org.apache.commons.io.FileUtils;
109
import org.apache.commons.lang3.StringUtils;
1110
import org.apache.commons.lang3.SystemUtils;
@@ -18,6 +17,7 @@
1817
import org.testng.SkipException;
1918
import org.testng.annotations.BeforeClass;
2019
import org.testng.annotations.Test;
20+
import org.testng.collections.Lists;
2121

2222
import java.io.File;
2323
import java.io.IOException;
@@ -43,7 +43,7 @@ public class DockerExtractorTest extends IntegrationTestsBase {
4343
private static final String SHORT_IMAGE_TAG_VIRTUAL = "3";
4444
private static final String EXPECTED_REMOTE_PATH_KANIKO = "hello-world/latest";
4545
private static final String DOCKER_HOST = "BITESTS_ARTIFACTORY_DOCKER_HOST";
46-
private final ArrayListMultimap<String, String> artifactProperties = ArrayListMultimap.create();
46+
private final MultiValuedMap<String, String> artifactProperties;
4747
private String pullImageFromVirtual;
4848
private String virtualDomainName;
4949
private String host;
@@ -56,12 +56,12 @@ public DockerExtractorTest() {
5656
localRepo1 = getKeyWithTimestamp(DOCKER_LOCAL_REPO);
5757
remoteRepo = getKeyWithTimestamp(DOCKER_REMOTE_REPO);
5858
virtualRepo = getKeyWithTimestamp(DOCKER_VIRTUAL_REPO);
59-
artifactProperties.putAll(ImmutableMultimap.<String, String>builder()
60-
.put("build.name", "docker-push-test")
61-
.put("build.number", "1")
62-
.put("build.timestamp", "321")
63-
.put("property-key", "property-value")
64-
.build());
59+
artifactProperties = new ArrayListValuedHashMap<String, String>() {{
60+
put("build.name", "docker-push-test");
61+
put("build.number", "1");
62+
put("build.timestamp", "321");
63+
put("property-key", "property-value");
64+
}};
6565
}
6666

6767
@BeforeClass

‎build-info-extractor-go/src/main/java/org/jfrog/build/extractor/go/extractor/GoPublish.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package org.jfrog.build.extractor.go.extractor;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
4-
import com.google.common.collect.ArrayListMultimap;
4+
import org.apache.commons.collections4.MultiValuedMap;
5+
import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
56
import org.apache.commons.compress.archivers.zip.ZipFile;
67
import org.apache.commons.lang3.StringUtils;
78
import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -46,7 +47,7 @@ public class GoPublish extends GoCommand {
4647
private static final String PKG_MOD_FILE_EXTENSION = "mod";
4748
private static final String PKG_INFO_FILE_EXTENSION = "info";
4849

49-
private final ArrayListMultimap<String, String> properties;
50+
private final MultiValuedMap<String, String> properties;
5051
private final List<Artifact> artifactList = new ArrayList<>();
5152
private final String deploymentRepo;
5253
private final String version;
@@ -61,7 +62,7 @@ public class GoPublish extends GoCommand {
6162
* @param version - The package's version.
6263
* @param logger - The logger.
6364
*/
64-
public GoPublish(ArtifactoryManagerBuilder artifactoryManagerBuilder, ArrayListMultimap<String, String> properties, String repo, Path path, String version, String module, Log logger) throws IOException {
65+
public GoPublish(ArtifactoryManagerBuilder artifactoryManagerBuilder, MultiValuedMap<String, String> properties, String repo, Path path, String version, String module, Log logger) throws IOException {
6566
super(artifactoryManagerBuilder, path, module, logger);
6667
this.goDriver = new GoDriver(GO_CLIENT_CMD, null, path.toFile(), logger);
6768
this.moduleName = goDriver.getModuleName();
@@ -93,7 +94,7 @@ public static void main(String[] ignored) {
9394

9495
GoPublish goPublish = new GoPublish(
9596
artifactoryManagerBuilder,
96-
ArrayListMultimap.create(clientConfiguration.publisher.getMatrixParams().asMultimap()),
97+
new ArrayListValuedHashMap<>(clientConfiguration.publisher.getMatrixParams()),
9798
clientConfiguration.publisher.getRepoKey(),
9899
Paths.get(packageManagerHandler.getPath() != null ? packageManagerHandler.getPath() : ".").toAbsolutePath(),
99100
clientConfiguration.goHandler.getGoPublishedVersion(),
@@ -153,7 +154,7 @@ private void createAndDeployInfo(ArtifactoryManager artifactoryManager) throws E
153154
private File archiveProjectDir() throws IOException {
154155
File zipFile = File.createTempFile(LOCAL_TMP_PKG_PREFIX + LOCAL_PKG_FILENAME, PKG_ZIP_FILE_EXTENSION, path.toFile());
155156
try (ZipOutputStream zos = new ZipOutputStream(Files.newOutputStream(zipFile.toPath()));
156-
Stream<Path> pathFileTree = Files.walk(path)) {
157+
Stream<Path> pathFileTree = Files.walk(path)) {
157158
List<Path> pathsList = pathFileTree
158159
// Remove .git dir content, directories and the temp zip file
159160
.filter(p -> !path.relativize(p).startsWith(".git/") && !Files.isDirectory(p) && !p.toFile().getName().equals(zipFile.getName()))

‎build-info-extractor-go/src/main/java/org/jfrog/build/extractor/go/extractor/GoZipBallStreamer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
package org.jfrog.build.extractor.go.extractor;
3636

37-
import com.google.common.collect.Sets;
3837
import org.apache.commons.compress.archivers.ArchiveOutputStream;
3938
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
4039
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
@@ -50,6 +49,7 @@
5049
import java.io.InputStream;
5150
import java.nio.charset.StandardCharsets;
5251
import java.util.Enumeration;
52+
import java.util.HashSet;
5353
import java.util.Set;
5454
import java.util.zip.ZipEntry;
5555

@@ -75,7 +75,7 @@ public GoZipBallStreamer(ZipFile zipFile, String projectName, String version, Lo
7575
this.projectName = projectName;
7676
this.version = version;
7777
this.log = log;
78-
excludedDirectories = Sets.newHashSet();
78+
excludedDirectories = new HashSet<>();
7979
}
8080

8181
public void writeDeployableZip(File deployableZip) throws IOException {
@@ -202,7 +202,7 @@ private boolean excludeEntry(String entryName) {
202202
private void scanEntries() {
203203
Enumeration<? extends ZipEntry> entries = zipFile.getEntries();
204204
ZipEntry zipEntry;
205-
Set<String> allDirectories = Sets.newHashSet();
205+
Set<String> allDirectories = new HashSet<>();
206206
while (entries.hasMoreElements()) {
207207
zipEntry = entries.nextElement();
208208
if (!zipEntry.isDirectory() && isSubModule(zipEntry.getName())) {

‎build-info-extractor-go/src/test/java/org/jfrog/build/extractor/go/GoDriverTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jfrog.build.extractor.go;
22

3-
import com.google.common.collect.Sets;
3+
import org.apache.commons.compress.utils.Sets;
44
import org.apache.commons.io.FileUtils;
55
import org.jfrog.build.api.util.NullLog;
66
import org.jfrog.build.extractor.executor.CommandResults;

‎build-info-extractor-go/src/test/java/org/jfrog/build/extractor/go/extractor/GoDependencyTreeTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.jfrog.build.extractor.go.extractor;
22

3-
import com.google.common.collect.Sets;
3+
import org.apache.commons.compress.utils.Sets;
44
import org.jfrog.build.api.util.NullLog;
55
import org.jfrog.build.extractor.scan.DependencyTree;
66
import org.testng.annotations.Test;

‎build-info-extractor-go/src/test/java/org/jfrog/build/extractor/go/extractor/GoExtractorTest.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package org.jfrog.build.extractor.go.extractor;
22

3-
import com.google.common.collect.ArrayListMultimap;
4-
import com.google.common.collect.Sets;
3+
import org.apache.commons.collections4.MultiMapUtils;
4+
import org.apache.commons.collections4.MultiValuedMap;
55
import org.apache.commons.io.FileUtils;
66
import org.apache.commons.lang3.StringUtils;
77
import org.apache.commons.lang3.exception.ExceptionUtils;
88
import org.jfrog.build.IntegrationTestsBase;
9-
import org.jfrog.build.extractor.ci.Module;
109
import org.jfrog.build.extractor.ci.*;
1110
import org.jfrog.build.extractor.clientConfiguration.ArtifactoryManagerBuilder;
1211
import org.jfrog.build.extractor.clientConfiguration.deploy.DeployDetails;
@@ -66,7 +65,7 @@ private enum Project {
6665
this.targetDir = targetDir;
6766
this.name = name;
6867
this.version = version;
69-
this.dependencies = Sets.newHashSet(dependencies);
68+
this.dependencies = new HashSet<>(Arrays.asList(dependencies));
7069
}
7170

7271
private String getDependencyId() {
@@ -176,7 +175,7 @@ public void goRunTest(Project project, String args, ArtifactoryManagerBuilder ar
176175
@Test
177176
public void goRunPublishTest() {
178177
Path projectDir = null;
179-
ArrayListMultimap<String, String> properties = ArrayListMultimap.create();
178+
MultiValuedMap<String, String> properties = MultiMapUtils.newListValuedHashMap();
180179
try {
181180
// Run Go build on project1 locally
182181
Project project = Project.PROJECT_1;

0 commit comments

Comments
 (0)