Skip to content

Commit a69e5a5

Browse files
committed
Format files with com.coveo:fmt-maven-plugin
1 parent d5c1483 commit a69e5a5

File tree

2 files changed

+32
-34
lines changed

2 files changed

+32
-34
lines changed

Diff for: util/src/main/java/io/kubernetes/client/util/Yaml.java

+6-9
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
package io.kubernetes.client.util;
1414

1515
import com.google.common.reflect.ClassPath;
16+
import io.kubernetes.client.custom.IntOrString;
1617
import java.io.File;
1718
import java.io.FileReader;
1819
import java.io.IOException;
@@ -21,16 +22,15 @@
2122
import java.util.HashMap;
2223
import java.util.Map;
2324
import java.util.Set;
24-
25-
import io.kubernetes.client.custom.IntOrString;
2625
import org.slf4j.Logger;
2726
import org.slf4j.LoggerFactory;
2827
import org.yaml.snakeyaml.constructor.Constructor;
2928
import org.yaml.snakeyaml.nodes.Node;
3029
import org.yaml.snakeyaml.nodes.ScalarNode;
3130

3231
public class Yaml {
33-
private static org.yaml.snakeyaml.Yaml yaml = new org.yaml.snakeyaml.Yaml(new CustomConstructor());
32+
private static org.yaml.snakeyaml.Yaml yaml =
33+
new org.yaml.snakeyaml.Yaml(new CustomConstructor());
3434
private static Map<String, Class<?>> classes = new HashMap<>();
3535

3636
static final Logger logger = LoggerFactory.getLogger(Yaml.class);
@@ -191,15 +191,12 @@ public static <T> T loadAs(Reader reader, Class<T> clazz) {
191191
return yaml.loadAs(reader, clazz);
192192
}
193193

194-
195-
/**
196-
* Defines constructor logic for custom types in this library.
197-
*/
194+
/** Defines constructor logic for custom types in this library. */
198195
public static class CustomConstructor extends Constructor {
199196
@Override
200197
protected Object constructObject(Node node) {
201-
if(node.getType() == IntOrString.class) {
202-
return constructIntOrString((ScalarNode)node);
198+
if (node.getType() == IntOrString.class) {
199+
return constructIntOrString((ScalarNode) node);
203200
}
204201
return super.constructObject(node);
205202
}

Diff for: util/src/test/java/io/kubernetes/client/util/YamlTest.java

+26-25
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,41 @@
1212
*/
1313
package io.kubernetes.client.util;
1414

15-
import io.kubernetes.client.custom.IntOrString;
15+
import static org.junit.Assert.*;
16+
1617
import io.kubernetes.client.models.V1ObjectMeta;
17-
import io.kubernetes.client.models.V1Service;
1818
import io.kubernetes.client.models.V1ServicePort;
19-
import org.junit.Test;
20-
2119
import java.io.StringReader;
2220
import java.lang.reflect.Method;
23-
24-
import static org.junit.Assert.*;
21+
import org.junit.Test;
2522

2623
public class YamlTest {
2724
@Test
2825
public void testLoad() {
29-
String[] kinds = new String[]{"Pod", "Deployment", "ClusterRole", "APIService", "Scale"};
26+
String[] kinds = new String[] {"Pod", "Deployment", "ClusterRole", "APIService", "Scale"};
3027
String[] apiVersions =
31-
new String[]{"v1", "v1beta2", "v1alpha1", "v1beta1", "extensions/v1beta1"};
28+
new String[] {"v1", "v1beta2", "v1alpha1", "v1beta1", "extensions/v1beta1"};
3229
String[] classNames =
33-
new String[]{
34-
"V1Pod",
35-
"V1beta2Deployment",
36-
"V1alpha1ClusterRole",
37-
"V1beta1APIService",
38-
"ExtensionsV1beta1Scale"
39-
};
30+
new String[] {
31+
"V1Pod",
32+
"V1beta2Deployment",
33+
"V1alpha1ClusterRole",
34+
"V1beta1APIService",
35+
"ExtensionsV1beta1Scale"
36+
};
4037
for (int i = 0; i < kinds.length; i++) {
4138
String kind = kinds[i];
4239
String className = classNames[i];
4340
try {
4441
String input =
45-
"kind: "
46-
+ kind
47-
+ "\n"
48-
+ "apiVersion: "
49-
+ apiVersions[i]
50-
+ "\n"
51-
+ "metadata:\n"
52-
+ " name: foo";
42+
"kind: "
43+
+ kind
44+
+ "\n"
45+
+ "apiVersion: "
46+
+ apiVersions[i]
47+
+ "\n"
48+
+ "metadata:\n"
49+
+ " name: foo";
5350
Object obj = Yaml.load(new StringReader(input));
5451
Method m = obj.getClass().getMethod("getMetadata");
5552
V1ObjectMeta metadata = (V1ObjectMeta) m.invoke(obj);
@@ -71,8 +68,12 @@ public void testLoadIntOrString() {
7168
V1ServicePort stringPort = Yaml.loadAs(strInput, V1ServicePort.class);
7269
V1ServicePort intPort = Yaml.loadAs(intInput, V1ServicePort.class);
7370

74-
assertFalse("Target port for 'stringPort' was parsed to an integer, string expected.", stringPort.getTargetPort().isInteger());
75-
assertTrue("Target port for 'intPort' was parsed to a string, integer expected.", intPort.getTargetPort().isInteger());
71+
assertFalse(
72+
"Target port for 'stringPort' was parsed to an integer, string expected.",
73+
stringPort.getTargetPort().isInteger());
74+
assertTrue(
75+
"Target port for 'intPort' was parsed to a string, integer expected.",
76+
intPort.getTargetPort().isInteger());
7677

7778
} catch (Exception ex) {
7879
assertNull("Unexpected exception: " + ex.toString(), ex);

0 commit comments

Comments
 (0)