Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2c8d9fb

Browse filesBrowse files
mdxaburohanKanojia
mdxabu
authored and
rohanKanojia
committed
Moved Guava classes with JDK inbuilt functionalities
Signed-off-by: mdxabu <abdullahfakrudeen2020@gmail.com>
1 parent 73d5d04 commit 2c8d9fb
Copy full SHA for 2c8d9fb

File tree

Expand file treeCollapse file tree

5 files changed

+20
-25
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+20
-25
lines changed

‎src/main/java/io/fabric8/maven/docker/AbstractDockerMojo.java

Copy file name to clipboardExpand all lines: src/main/java/io/fabric8/maven/docker/AbstractDockerMojo.java
+5-8Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22

33
import java.io.File;
44
import java.io.IOException;
5-
import java.util.Date;
6-
import java.util.List;
7-
import java.util.Map;
8-
import java.util.Properties;
5+
import java.util.*;
96
import java.util.regex.Matcher;
107
import java.util.regex.Pattern;
118
import java.util.stream.Collectors;
129

13-
import com.google.common.collect.ImmutableList;
1410
import io.fabric8.maven.docker.access.DockerAccess;
1511
import io.fabric8.maven.docker.access.DockerAccessException;
1612
import io.fabric8.maven.docker.access.ExecException;
@@ -501,8 +497,9 @@ protected LogDispatcher getLogDispatcher(ServiceHub hub) {
501497
return dispatcher;
502498
}
503499

504-
private ImmutableList<ImageConfiguration> getAllImages() {
505-
ImmutableList.Builder<ImageConfiguration> allImages = ImmutableList.builder();
500+
private List<ImageConfiguration> getAllImages() {
501+
List<ImageConfiguration> allImages = new ArrayList<>();
502+
506503
if (images != null) {
507504
allImages.addAll(images);
508505
}
@@ -514,7 +511,7 @@ private ImmutableList<ImageConfiguration> getAllImages() {
514511
allImages.add(config);
515512
});
516513
}
517-
return allImages.build();
514+
return Collections.unmodifiableList(allImages);
518515
}
519516

520517
public ImagePullManager getImagePullManager(String imagePullPolicy, String autoPull) {

‎src/main/java/io/fabric8/maven/docker/util/ContainerNamingUtil.java

Copy file name to clipboardExpand all lines: src/main/java/io/fabric8/maven/docker/util/ContainerNamingUtil.java
+4-9Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
package io.fabric8.maven.docker.util;
22

3-
import java.util.ArrayList;
4-
import java.util.Collection;
5-
import java.util.Date;
6-
import java.util.HashMap;
7-
import java.util.Map;
8-
import java.util.Set;
3+
import java.util.*;
94
import java.util.function.Function;
105
import java.util.stream.Collectors;
116

12-
import com.google.common.collect.ImmutableSet;
137
import io.fabric8.maven.docker.config.ImageConfiguration;
148
import io.fabric8.maven.docker.config.RunImageConfiguration;
159
import io.fabric8.maven.docker.model.Container;
@@ -164,11 +158,12 @@ private static Collection<Container> keepOnlyLastIndexedContainer(Collection<Con
164158
}
165159

166160
private static Set<String> extractContainerNames(final Collection<Container> existingContainers) {
167-
final ImmutableSet.Builder<String> containerNamesBuilder = ImmutableSet.builder();
161+
final Set<String> containerNamesBuilder = new HashSet<>();
168162
for (final Container container : existingContainers) {
169163
containerNamesBuilder.add(container.getName());
170164
}
171-
return containerNamesBuilder.build();
165+
166+
return Collections.unmodifiableSet(containerNamesBuilder);
172167
}
173168

174169
private static String extractContainerNamePattern(ImageConfiguration image, String defaultContainerNamePattern) {

‎src/main/java/io/fabric8/maven/docker/util/CredentialHelperClient.java

Copy file name to clipboardExpand all lines: src/main/java/io/fabric8/maven/docker/util/CredentialHelperClient.java
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package io.fabric8.maven.docker.util;
22

3-
import com.google.common.base.Joiner;
4-
import com.google.common.collect.Lists;
53
import com.google.gson.JsonObject;
64

75
import org.apache.maven.plugin.MojoExecutionException;
86

97
import java.io.IOException;
8+
import java.util.LinkedList;
109
import java.util.List;
1110

1211
import io.fabric8.maven.docker.access.AuthConfig;
@@ -93,7 +92,7 @@ public String getVersion() throws IOException {
9392
// echo <registryToLookup> | docker-credential-XXX get
9493
private class GetCommand extends ExternalCommand {
9594

96-
private List<String> reply = Lists.newLinkedList();
95+
private final List<String> reply = new LinkedList<>();
9796

9897
GetCommand() {
9998
super(CredentialHelperClient.this.log);
@@ -119,9 +118,10 @@ public JsonObject getCredentialNode(String registryToLookup) throws IOException
119118
throw ex;
120119
}
121120
}
122-
JsonObject credentials = JsonFactory.newJsonObject(Joiner.on('\n').join(reply));
121+
String joinedReply = String.join("\n", reply);
122+
JsonObject credentials = JsonFactory.newJsonObject(joinedReply);
123123
if (!credentials.has(SECRET_KEY) || !credentials.has(USERNAME_KEY)) {
124-
return null;
124+
return null; // If keys are missing, return null
125125
}
126126
return credentials;
127127
}

‎src/main/java/io/fabric8/maven/docker/util/ImageNameFormatter.java

Copy file name to clipboardExpand all lines: src/main/java/io/fabric8/maven/docker/util/ImageNameFormatter.java
+6-2Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import java.util.Date;
2121
import java.util.HashMap;
2222
import java.util.Map;
23+
import java.util.Objects;
2324

24-
import com.google.common.base.Strings;
2525
import io.fabric8.maven.docker.config.ConfigHelper;
2626
import org.apache.maven.project.MavenProject;
2727

@@ -178,7 +178,7 @@ public String doTransform(String tag, Date now) {
178178

179179
public String transform(MavenProject project, String tag, Date now) {
180180
// In case the Maven property is also a placeholder, replace it as well
181-
if (Strings.isNullOrEmpty(tag) || tag.equals("%" + letter)) {
181+
if(isNullorEmpty(tag) || tag.equals("%" + letter)) {
182182
tag = project.getVersion();
183183
}
184184
return doTransform(tag, now);
@@ -248,4 +248,8 @@ private static String sanitizeName(String name) {
248248
// All characters must be lowercase
249249
return ret.toString().toLowerCase();
250250
}
251+
252+
private static boolean isNullorEmpty(String s) {
253+
return Objects.isNull(s) || s.isEmpty();
254+
}
251255
}

‎src/main/java/io/fabric8/maven/docker/util/JibServiceUtil.java

Copy file name to clipboardExpand all lines: src/main/java/io/fabric8/maven/docker/util/JibServiceUtil.java
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.fabric8.maven.docker.config.Arguments;
2121
import io.fabric8.maven.docker.config.BuildImageConfiguration;
2222
import io.fabric8.maven.docker.config.ImageConfiguration;
23-
import io.fabric8.maven.docker.model.Image;
2423
import org.apache.commons.lang3.StringUtils;
2524

2625
import java.io.File;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.