Skip to content

Commit 036006b

Browse files
committed
reformat code
1 parent e1b2405 commit 036006b

File tree

6 files changed

+15
-27
lines changed

6 files changed

+15
-27
lines changed

samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentEvent.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@ public class DeploymentEvent extends AbstractEvent {
1010
private final Deployment deployment;
1111

1212
public DeploymentEvent(
13-
Watcher.Action action,
14-
Deployment deployment,
15-
DeploymentEventSource deploymentEventSource,
16-
String tomcatUid) {
13+
Watcher.Action action, Deployment resource, DeploymentEventSource deploymentEventSource) {
1714
// TODO: this mapping is really critical and should be made more explicit
18-
super(tomcatUid, deploymentEventSource);
15+
super(resource.getMetadata().getOwnerReferences().get(0).getUid(), deploymentEventSource);
1916
this.action = action;
20-
this.deployment = deployment;
17+
this.deployment = resource;
2118
}
2219

2320
public Watcher.Action getAction() {

samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/DeploymentEventSource.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package io.javaoperatorsdk.operator.sample;
22

3+
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
4+
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
5+
import static java.net.HttpURLConnection.HTTP_GONE;
6+
37
import io.fabric8.kubernetes.api.model.apps.Deployment;
48
import io.fabric8.kubernetes.client.KubernetesClient;
59
import io.fabric8.kubernetes.client.KubernetesClientException;
@@ -8,10 +12,6 @@
812
import org.slf4j.Logger;
913
import org.slf4j.LoggerFactory;
1014

11-
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
12-
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
13-
import static java.net.HttpURLConnection.HTTP_GONE;
14-
1515
public class DeploymentEventSource extends AbstractEventSource implements Watcher<Deployment> {
1616
private static final Logger log = LoggerFactory.getLogger(DeploymentEventSource.class);
1717

@@ -53,12 +53,7 @@ public void eventReceived(Action action, Deployment deployment) {
5353
return;
5454
}
5555

56-
eventHandler.handleEvent(
57-
new DeploymentEvent(
58-
action,
59-
deployment,
60-
this,
61-
deployment.getMetadata().getOwnerReferences().get(0).getUid()));
56+
eventHandler.handleEvent(new DeploymentEvent(action, deployment, this));
6257
}
6358

6459
@Override

samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatController.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@
1818
import io.javaoperatorsdk.operator.api.*;
1919
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
2020
import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
21-
import org.apache.commons.lang3.builder.EqualsBuilder;
22-
import org.slf4j.Logger;
23-
import org.slf4j.LoggerFactory;
24-
2521
import java.io.IOException;
2622
import java.io.InputStream;
2723
import java.util.Objects;
2824
import java.util.Optional;
25+
import org.apache.commons.lang3.builder.EqualsBuilder;
26+
import org.slf4j.Logger;
27+
import org.slf4j.LoggerFactory;
2928

3029
@Controller(crdName = "tomcats.tomcatoperator.io")
3130
public class TomcatController implements ResourceController<Tomcat> {

samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
66
import io.fabric8.kubernetes.client.KubernetesClient;
77
import io.javaoperatorsdk.operator.Operator;
8+
import java.io.IOException;
89
import org.slf4j.Logger;
910
import org.slf4j.LoggerFactory;
1011
import org.takes.facets.fork.FkRegex;
1112
import org.takes.facets.fork.TkFork;
1213
import org.takes.http.Exit;
1314
import org.takes.http.FtBasic;
1415

15-
import java.io.IOException;
16-
1716
public class TomcatOperator {
1817

1918
private static final Logger log = LoggerFactory.getLogger(TomcatOperator.class);

samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WatchedResource.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package io.javaoperatorsdk.operator.sample;
22

33
import io.fabric8.kubernetes.api.model.HasMetadata;
4-
import org.apache.commons.lang3.builder.EqualsBuilder;
5-
64
import java.util.Objects;
5+
import org.apache.commons.lang3.builder.EqualsBuilder;
76

87
class WatchedResource {
98
private final String type;

samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/WebappController.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
import io.fabric8.kubernetes.api.model.apps.Deployment;
55
import io.fabric8.kubernetes.client.KubernetesClient;
66
import io.javaoperatorsdk.operator.api.*;
7-
import org.slf4j.Logger;
8-
import org.slf4j.LoggerFactory;
9-
107
import java.io.ByteArrayOutputStream;
118
import java.util.List;
129
import java.util.Objects;
1310
import java.util.regex.Matcher;
1411
import java.util.regex.Pattern;
12+
import org.slf4j.Logger;
13+
import org.slf4j.LoggerFactory;
1514

1615
@Controller(crdName = "webapps.tomcatoperator.io")
1716
public class WebappController implements ResourceController<Webapp> {

0 commit comments

Comments
 (0)