Skip to content

Commit d487d69

Browse files
shawkinsmanusa
shawkins
authored and
manusa
committed
fix #4067 running spotless
1 parent 064bd2e commit d487d69

File tree

13 files changed

+163
-163
lines changed

13 files changed

+163
-163
lines changed

‎crd-generator/test/src/test/java/io/fabric8/crd/generator/Base.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @author <a href="claprun@redhat.com">Christophe Laprun</a>
2525
*/
2626
public abstract class Base<Spec extends BaseSpec, Status extends BaseStatus>
27-
extends CustomResource<Spec, Status>
28-
implements Namespaced {
27+
extends CustomResource<Spec, Status>
28+
implements Namespaced {
2929

3030
}

‎crd-generator/test/src/test/java/io/fabric8/crd/generator/inherited/Child.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,4 @@
2424
@Group("acme.com")
2525
public class Child extends Base<ChildSpec, ChildStatus> implements Namespaced {
2626

27-
2827
}

‎crd-generator/test/src/test/java/io/fabric8/crd/generator/inherited/ChildCRDTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
*/
1616
package io.fabric8.crd.generator.inherited;
1717

18-
import static org.junit.jupiter.api.Assertions.assertEquals;
19-
import static org.junit.jupiter.api.Assertions.assertNotNull;
20-
import static org.junit.jupiter.api.Assertions.assertTrue;
21-
2218
import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
2319
import io.fabric8.kubernetes.client.utils.Serialization;
2420
import org.junit.jupiter.api.Test;
2521

22+
import static org.junit.jupiter.api.Assertions.assertEquals;
23+
import static org.junit.jupiter.api.Assertions.assertNotNull;
24+
import static org.junit.jupiter.api.Assertions.assertTrue;
25+
2626
class ChildCRDTest {
2727

2828
@Test
2929
void testCrd() {
3030
CustomResourceDefinition d = Serialization.unmarshal(getClass().getClassLoader()
3131
.getResourceAsStream("META-INF/fabric8/children.acme.com-v1.yml"),
32-
CustomResourceDefinition.class);
32+
CustomResourceDefinition.class);
3333
assertNotNull(d);
3434
assertEquals("Child", d.getSpec().getNames().getKind());
3535
assertEquals("children", d.getSpec().getNames().getPlural());

‎crd-generator/test/src/test/java/io/fabric8/crd/generator/joke/Joke.java

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -26,57 +26,57 @@
2626
@Version("v1alpha1")
2727
@JsonInclude(Include.NON_NULL)
2828
public class Joke extends CustomResource<Void, Void> implements Namespaced {
29-
private String joke;
30-
private String category;
31-
private boolean safe;
32-
private String lang;
33-
private int id;
29+
private String joke;
30+
private String category;
31+
private boolean safe;
32+
private String lang;
33+
private int id;
3434

35-
public Joke() {
36-
}
35+
public Joke() {
36+
}
3737

38-
public Joke(int id, String joke, String category, boolean safe, String lang) {
39-
this.id = id;
40-
getMetadata().setName("" + id);
41-
this.joke = joke;
42-
this.category = category;
43-
this.safe = safe;
44-
this.lang = lang;
45-
}
38+
public Joke(int id, String joke, String category, boolean safe, String lang) {
39+
this.id = id;
40+
getMetadata().setName("" + id);
41+
this.joke = joke;
42+
this.category = category;
43+
this.safe = safe;
44+
this.lang = lang;
45+
}
4646

47-
public int getId() {
48-
return id;
49-
}
47+
public int getId() {
48+
return id;
49+
}
5050

51-
public String getJoke() {
52-
return joke;
53-
}
51+
public String getJoke() {
52+
return joke;
53+
}
5454

55-
public void setJoke(String joke) {
56-
this.joke = joke;
57-
}
55+
public void setJoke(String joke) {
56+
this.joke = joke;
57+
}
5858

59-
public String getCategory() {
60-
return category;
61-
}
59+
public String getCategory() {
60+
return category;
61+
}
6262

63-
public void setCategory(String category) {
64-
this.category = category;
65-
}
63+
public void setCategory(String category) {
64+
this.category = category;
65+
}
6666

67-
public boolean isSafe() {
68-
return safe;
69-
}
67+
public boolean isSafe() {
68+
return safe;
69+
}
7070

71-
public void setSafe(boolean safe) {
72-
this.safe = safe;
73-
}
71+
public void setSafe(boolean safe) {
72+
this.safe = safe;
73+
}
7474

75-
public String getLang() {
76-
return lang;
77-
}
75+
public String getLang() {
76+
return lang;
77+
}
7878

79-
public void setLang(String lang) {
80-
this.lang = lang;
81-
}
79+
public void setLang(String lang) {
80+
this.lang = lang;
81+
}
8282
}

‎crd-generator/test/src/test/java/io/fabric8/crd/generator/joke/JokeRequestSpec.java

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,50 +16,50 @@
1616
package io.fabric8.crd.generator.joke;
1717

1818
public class JokeRequestSpec {
19-
public enum Category {
20-
Any,
21-
Misc,
22-
Programming,
23-
Dark,
24-
Pun,
25-
Spooky,
26-
Christmas
27-
}
19+
public enum Category {
20+
Any,
21+
Misc,
22+
Programming,
23+
Dark,
24+
Pun,
25+
Spooky,
26+
Christmas
27+
}
2828

29-
public enum ExcludedTopic {
30-
nsfw,
31-
religious,
32-
political,
33-
racist,
34-
sexist,
35-
explicit
36-
}
29+
public enum ExcludedTopic {
30+
nsfw,
31+
religious,
32+
political,
33+
racist,
34+
sexist,
35+
explicit
36+
}
3737

38-
private Category category = Category.Any;
39-
private ExcludedTopic[] excluded = new ExcludedTopic[] { ExcludedTopic.nsfw, ExcludedTopic.racist, ExcludedTopic.sexist };
40-
private boolean safe;
38+
private Category category = Category.Any;
39+
private ExcludedTopic[] excluded = new ExcludedTopic[] { ExcludedTopic.nsfw, ExcludedTopic.racist, ExcludedTopic.sexist };
40+
private boolean safe;
4141

42-
public Category getCategory() {
43-
return category;
44-
}
42+
public Category getCategory() {
43+
return category;
44+
}
4545

46-
public void setCategory(Category category) {
47-
this.category = category;
48-
}
46+
public void setCategory(Category category) {
47+
this.category = category;
48+
}
4949

50-
public ExcludedTopic[] getExcluded() {
51-
return excluded;
52-
}
50+
public ExcludedTopic[] getExcluded() {
51+
return excluded;
52+
}
5353

54-
public void setExcluded(ExcludedTopic[] excluded) {
55-
this.excluded = excluded;
56-
}
54+
public void setExcluded(ExcludedTopic[] excluded) {
55+
this.excluded = excluded;
56+
}
5757

58-
public boolean isSafe() {
59-
return safe;
60-
}
58+
public boolean isSafe() {
59+
return safe;
60+
}
6161

62-
public void setSafe(boolean safe) {
63-
this.safe = safe;
64-
}
62+
public void setSafe(boolean safe) {
63+
this.safe = safe;
64+
}
6565
}

‎crd-generator/test/src/test/java/io/fabric8/crd/generator/joke/JokeRequestStatus.java

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,39 @@
1616
package io.fabric8.crd.generator.joke;
1717

1818
public class JokeRequestStatus {
19-
public enum State {
20-
CREATED,
21-
ALREADY_PRESENT,
22-
PROCESSING,
23-
ERROR,
24-
UNKNOWN
25-
}
26-
27-
private State state = State.UNKNOWN;
28-
private boolean error;
29-
private String message;
30-
31-
public State getState() {
32-
return state;
33-
}
34-
35-
public void setState(State state) {
36-
this.state = state;
37-
}
38-
39-
public boolean isError() {
40-
return error;
41-
}
42-
43-
public void setError(boolean error) {
44-
this.error = error;
45-
}
46-
47-
public String getMessage() {
48-
return message;
49-
}
50-
51-
public void setMessage(String message) {
52-
this.message = message;
53-
}
19+
public enum State {
20+
CREATED,
21+
ALREADY_PRESENT,
22+
PROCESSING,
23+
ERROR,
24+
UNKNOWN
25+
}
26+
27+
private State state = State.UNKNOWN;
28+
private boolean error;
29+
private String message;
30+
31+
public State getState() {
32+
return state;
33+
}
34+
35+
public void setState(State state) {
36+
this.state = state;
37+
}
38+
39+
public boolean isError() {
40+
return error;
41+
}
42+
43+
public void setError(boolean error) {
44+
this.error = error;
45+
}
46+
47+
public String getMessage() {
48+
return message;
49+
}
50+
51+
public void setMessage(String message) {
52+
this.message = message;
53+
}
5454
}

‎crd-generator/test/src/test/java/io/fabric8/crd/generator/zookeeper/ZookeeperCustomResourceTest.java

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
*/
1616
package io.fabric8.crd.generator.zookeeper;
1717

18-
import static org.junit.jupiter.api.Assertions.assertEquals;
19-
import static org.junit.jupiter.api.Assertions.assertNotNull;
20-
import static org.junit.jupiter.api.Assertions.assertTrue;
21-
2218
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
2319
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionVersion;
2420
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps;
@@ -28,11 +24,17 @@
2824
import java.util.List;
2925
import java.util.Optional;
3026

27+
import static org.junit.jupiter.api.Assertions.assertEquals;
28+
import static org.junit.jupiter.api.Assertions.assertNotNull;
29+
import static org.junit.jupiter.api.Assertions.assertTrue;
30+
3131
class ZookeeperCustomResourceTest {
3232

3333
@Test
3434
void testCrd() {
35-
CustomResourceDefinition d = Serialization.unmarshal(getClass().getClassLoader().getResourceAsStream("META-INF/fabric8/zookeepers.io.zookeeper-v1beta1.yml"), CustomResourceDefinition.class);
35+
CustomResourceDefinition d = Serialization.unmarshal(
36+
getClass().getClassLoader().getResourceAsStream("META-INF/fabric8/zookeepers.io.zookeeper-v1beta1.yml"),
37+
CustomResourceDefinition.class);
3638
assertNotNull(d);
3739
assertEquals("Zookeeper", d.getSpec().getNames().getKind());
3840
assertEquals("zookeepers", d.getSpec().getNames().getPlural());
@@ -44,28 +46,29 @@ void testCrd() {
4446
assertEquals(".spec.size", d.getSpec().getSubresources().getScale().getSpecReplicasPath());
4547
assertNotNull(d.getSpec().getSubresources().getStatus());
4648

47-
Optional<CustomResourceDefinitionVersion> v1 = d.getSpec().getVersions().stream().filter(v -> v.getName().equals("v1")).findFirst();
49+
Optional<CustomResourceDefinitionVersion> v1 = d.getSpec().getVersions().stream().filter(v -> v.getName().equals("v1"))
50+
.findFirst();
4851
assertTrue(v1.isPresent());
4952
v1.ifPresent(v -> {
50-
//Let's check that version is marked as required
51-
Object spec = v.getSchema().getOpenAPIV3Schema().getProperties().get("spec");
52-
assertNotNull(spec);
53-
JSONSchemaProps props = (JSONSchemaProps) spec;
54-
List<String> required = props.getRequired();
55-
assertTrue(required.contains("version"));
56-
});
53+
//Let's check that version is marked as required
54+
Object spec = v.getSchema().getOpenAPIV3Schema().getProperties().get("spec");
55+
assertNotNull(spec);
56+
JSONSchemaProps props = (JSONSchemaProps) spec;
57+
List<String> required = props.getRequired();
58+
assertTrue(required.contains("version"));
59+
});
5760

58-
Optional<CustomResourceDefinitionVersion> v1alpha1 = d.getSpec().getVersions().stream().filter(v -> v.getName().equals("v1alpha1")).findFirst();
61+
Optional<CustomResourceDefinitionVersion> v1alpha1 = d.getSpec().getVersions().stream()
62+
.filter(v -> v.getName().equals("v1alpha1")).findFirst();
5963
assertTrue(v1alpha1.isPresent());
6064
v1.ifPresent(v -> {
61-
//Let's check that version is marked as required
62-
Object spec = v.getSchema().getOpenAPIV3Schema().getProperties().get("spec");
63-
assertNotNull(spec);
64-
JSONSchemaProps props = (JSONSchemaProps) spec;
65-
List<String> required = props.getRequired();
66-
assertTrue(required.contains("version"));
67-
});
65+
//Let's check that version is marked as required
66+
Object spec = v.getSchema().getOpenAPIV3Schema().getProperties().get("spec");
67+
assertNotNull(spec);
68+
JSONSchemaProps props = (JSONSchemaProps) spec;
69+
List<String> required = props.getRequired();
70+
assertTrue(required.contains("version"));
71+
});
6872

6973
}
7074
}
71-

‎crd-generator/test/src/test/java/io/fabric8/crd/generator/zookeeper/v1/Zookeeper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@
2626
public class Zookeeper extends CustomResource<ZookeeperSpec, ZookeeperStatus> implements Namespaced {
2727

2828
}
29-

0 commit comments

Comments
 (0)