Skip to content

Commit a3bf4cd

Browse files
committed
Add specific imports and use Pair<String, String>
1 parent 5a0439c commit a3bf4cd

File tree

1 file changed

+22
-17
lines changed
  • util/src/main/java/io/kubernetes/client/util

1 file changed

+22
-17
lines changed

util/src/main/java/io/kubernetes/client/util/Yaml.java

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@
1818
import java.io.IOException;
1919
import java.io.Reader;
2020
import java.io.StringReader;
21-
import java.util.*;
21+
import java.util.ArrayList;
22+
import java.util.HashMap;
23+
import java.util.List;
24+
import java.util.Map;
25+
import java.util.Set;
26+
import org.apache.commons.lang3.tuple.MutablePair;
27+
import org.apache.commons.lang3.tuple.Pair;
2228
import org.slf4j.Logger;
2329
import org.slf4j.LoggerFactory;
2430

@@ -59,31 +65,30 @@ private static void initApiVersionList() {
5965
apiVersions.add("V1");
6066
}
6167

62-
private static String[] getApiGroup(String name) {
63-
String[] parts = new String[2];
64-
68+
private static Pair<String, String> getApiGroup(String name) {
69+
MutablePair<String, String> parts = new MutablePair<>();
6570
for (String prefix : apiGroups.keySet()) {
6671
if (name.startsWith(prefix)) {
67-
parts[0] = apiGroups.get(prefix);
68-
parts[1] = name.substring(prefix.length());
72+
parts.left = apiGroups.get(prefix);
73+
parts.right = name.substring(prefix.length());
6974
break;
7075
}
7176
}
72-
if (parts[0] == null) parts[1] = name;
77+
if (parts.left == null) parts.right = name;
7378

7479
return parts;
7580
}
7681

77-
private static String[] getApiVersion(String name) {
78-
String[] parts = new String[2];
82+
private static Pair<String, String> getApiVersion(String name) {
83+
MutablePair<String, String> parts = new MutablePair<>();
7984
for (String version : apiVersions) {
8085
if (name.startsWith(version)) {
81-
parts[0] = version.toLowerCase();
82-
parts[1] = name.substring(version.length());
86+
parts.left = version.toLowerCase();
87+
parts.right = name.substring(version.length());
8388
break;
8489
}
8590
}
86-
if (parts[0] == null) parts[1] = name;
91+
if (parts.left == null) parts.right = name;
8792

8893
return parts;
8994
}
@@ -97,12 +102,12 @@ private static void initModelMap() throws IOException {
97102

98103
for (ClassPath.ClassInfo clazz : allClasses) {
99104
String modelName = "";
100-
String[] nameParts = getApiGroup(clazz.getSimpleName());
101-
modelName += nameParts[0] == null ? "" : nameParts[0] + "/";
105+
Pair<String, String> nameParts = getApiGroup(clazz.getSimpleName());
106+
modelName += nameParts.getLeft() == null ? "" : nameParts.getLeft() + "/";
102107

103-
nameParts = getApiVersion(nameParts[1]);
104-
modelName += nameParts[0] == null ? "" : nameParts[0] + "/";
105-
modelName += nameParts[1];
108+
nameParts = getApiVersion(nameParts.getRight());
109+
modelName += nameParts.getLeft() == null ? "" : nameParts.getLeft() + "/";
110+
modelName += nameParts.getRight();
106111

107112
classes.put(modelName, clazz.load());
108113
}

0 commit comments

Comments
 (0)