Skip to content

Commit d5f1045

Browse files
committed
Replace guava with java 8 standard lib
1 parent 4790b57 commit d5f1045

File tree

3 files changed

+43
-38
lines changed

3 files changed

+43
-38
lines changed

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ ext {
6363
dependencies {
6464
compileOnly project.deps.gocdPluginApi
6565
implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
66-
implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre'
6766
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
6867
implementation group: 'commons-io', name: 'commons-io', version: '2.11.0'
6968
implementation group: 'joda-time', name: 'joda-time', version: '2.12.2'

src/main/java/cd/go/contrib/elasticagent/Agents.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
package cd.go.contrib.elasticagent;
1818

1919

20-
import com.google.common.base.Predicate;
21-
import com.google.common.collect.FluentIterable;
22-
2320
import java.util.*;
21+
import java.util.function.Predicate;
22+
import java.util.stream.Collectors;
2423

2524
/**
2625
* Represents a map of {@link Agent#elasticAgentId()} to the {@link Agent} for easy lookups
@@ -57,11 +56,11 @@ public void addAll(Agents agents) {
5756
}
5857

5958
public Collection<Agent> findInstancesToDisable() {
60-
return FluentIterable.from(agents.values()).filter(AGENT_IDLE_PREDICATE).toList();
59+
return agents.values().stream().filter(AGENT_IDLE_PREDICATE).collect(Collectors.toList());
6160
}
6261

6362
public Collection<Agent> findInstancesToTerminate() {
64-
return FluentIterable.from(agents.values()).filter(AGENT_DISABLED_PREDICATE).toList();
63+
return agents.values().stream().filter(AGENT_DISABLED_PREDICATE).collect(Collectors.toList());
6564
}
6665

6766
public Set<String> agentIds() {

src/main/java/cd/go/contrib/elasticagent/utils/Size.java

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,52 +16,57 @@
1616

1717
package cd.go.contrib.elasticagent.utils;
1818

19-
import com.google.common.collect.ImmutableSortedMap;
2019
import io.fabric8.kubernetes.api.model.Quantity;
2120
import org.apache.commons.lang3.StringUtils;
2221

2322
import java.text.DecimalFormat;
23+
import java.util.Collections;
2424
import java.util.Locale;
2525
import java.util.Map;
2626
import java.util.Objects;
27+
import java.util.TreeMap;
2728
import java.util.regex.Matcher;
2829
import java.util.regex.Pattern;
2930

30-
import static com.google.common.base.Preconditions.checkArgument;
3131
import static java.util.Objects.requireNonNull;
3232

3333
public class Size implements Comparable<Size> {
3434
private static final Pattern SIZE_PATTERN = Pattern.compile("(\\d+)\\s*(\\S+)");
3535

36-
private static final Map<String, SizeUnit> SUFFIXES = ImmutableSortedMap.<String, SizeUnit>orderedBy(String.CASE_INSENSITIVE_ORDER)
37-
.put("B", SizeUnit.BYTES)
38-
.put("byte", SizeUnit.BYTES)
39-
.put("bytes", SizeUnit.BYTES)
40-
.put("K", SizeUnit.KILOBYTES)
41-
.put("KB", SizeUnit.KILOBYTES)
42-
.put("Ki", SizeUnit.KILOBYTES)
43-
.put("KiB", SizeUnit.KILOBYTES)
44-
.put("kilobyte", SizeUnit.KILOBYTES)
45-
.put("kilobytes", SizeUnit.KILOBYTES)
46-
.put("M", SizeUnit.MEGABYTES)
47-
.put("Mi", SizeUnit.MEGABYTES)
48-
.put("MB", SizeUnit.MEGABYTES)
49-
.put("MiB", SizeUnit.MEGABYTES)
50-
.put("megabyte", SizeUnit.MEGABYTES)
51-
.put("megabytes", SizeUnit.MEGABYTES)
52-
.put("G", SizeUnit.GIGABYTES)
53-
.put("Gi", SizeUnit.GIGABYTES)
54-
.put("GB", SizeUnit.GIGABYTES)
55-
.put("GiB", SizeUnit.GIGABYTES)
56-
.put("gigabyte", SizeUnit.GIGABYTES)
57-
.put("gigabytes", SizeUnit.GIGABYTES)
58-
.put("T", SizeUnit.TERABYTES)
59-
.put("TB", SizeUnit.TERABYTES)
60-
.put("Ti", SizeUnit.TERABYTES)
61-
.put("TiB", SizeUnit.TERABYTES)
62-
.put("terabyte", SizeUnit.TERABYTES)
63-
.put("terabytes", SizeUnit.TERABYTES)
64-
.build();
36+
private static final Map<String, SizeUnit> SUFFIXES;
37+
38+
static {
39+
Map<String, SizeUnit> tmpSuffixes = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
40+
tmpSuffixes.put("B", SizeUnit.BYTES);
41+
tmpSuffixes.put("byte", SizeUnit.BYTES);
42+
tmpSuffixes.put("bytes", SizeUnit.BYTES);
43+
tmpSuffixes.put("K", SizeUnit.KILOBYTES);
44+
tmpSuffixes.put("KB", SizeUnit.KILOBYTES);
45+
tmpSuffixes.put("Ki", SizeUnit.KILOBYTES);
46+
tmpSuffixes.put("KiB", SizeUnit.KILOBYTES);
47+
tmpSuffixes.put("kilobyte", SizeUnit.KILOBYTES);
48+
tmpSuffixes.put("kilobytes", SizeUnit.KILOBYTES);
49+
tmpSuffixes.put("M", SizeUnit.MEGABYTES);
50+
tmpSuffixes.put("Mi", SizeUnit.MEGABYTES);
51+
tmpSuffixes.put("MB", SizeUnit.MEGABYTES);
52+
tmpSuffixes.put("MiB", SizeUnit.MEGABYTES);
53+
tmpSuffixes.put("megabyte", SizeUnit.MEGABYTES);
54+
tmpSuffixes.put("megabytes", SizeUnit.MEGABYTES);
55+
tmpSuffixes.put("G", SizeUnit.GIGABYTES);
56+
tmpSuffixes.put("Gi", SizeUnit.GIGABYTES);
57+
tmpSuffixes.put("GB", SizeUnit.GIGABYTES);
58+
tmpSuffixes.put("GiB", SizeUnit.GIGABYTES);
59+
tmpSuffixes.put("gigabyte", SizeUnit.GIGABYTES);
60+
tmpSuffixes.put("gigabytes", SizeUnit.GIGABYTES);
61+
tmpSuffixes.put("T", SizeUnit.TERABYTES);
62+
tmpSuffixes.put("TB", SizeUnit.TERABYTES);
63+
tmpSuffixes.put("Ti", SizeUnit.TERABYTES);
64+
tmpSuffixes.put("TiB", SizeUnit.TERABYTES);
65+
tmpSuffixes.put("terabyte", SizeUnit.TERABYTES);
66+
tmpSuffixes.put("terabytes", SizeUnit.TERABYTES);
67+
SUFFIXES = Collections.unmodifiableMap(tmpSuffixes);
68+
}
69+
6570
private final double count;
6671
private final SizeUnit unit;
6772

@@ -95,7 +100,9 @@ public static Size parse(String size) {
95100
throw new IllegalArgumentException();
96101
}
97102
final Matcher matcher = SIZE_PATTERN.matcher(size);
98-
checkArgument(matcher.matches(), "Invalid size: " + size);
103+
if (!matcher.matches()) {
104+
throw new IllegalArgumentException("Invalid size: " + size);
105+
}
99106

100107
final double count = Double.parseDouble(matcher.group(1));
101108
final SizeUnit unit = SUFFIXES.get(matcher.group(2));

0 commit comments

Comments
 (0)