Skip to content

Commit 7657c25

Browse files
committed
refactor: unify usage of var keyword and formatting
Signed-off-by: David Sondermann <[email protected]>
1 parent 3b5972c commit 7657c25

File tree

58 files changed

+196
-243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+196
-243
lines changed

core/src/main/java/io/javaoperatorsdk/webhook/admission/AdmissionController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ public AdmissionController(AdmissionRequestHandler admissionRequestHandler) {
2525

2626
public AdmissionReview handle(AdmissionReview admissionReview) {
2727
var response = admissionRequestHandler.handle(admissionReview.getRequest());
28-
AdmissionReview responseAdmissionReview = new AdmissionReview();
28+
var responseAdmissionReview = new AdmissionReview();
2929
responseAdmissionReview.setResponse(response);
3030
response.setUid(admissionReview.getRequest().getUid());
3131
return responseAdmissionReview;
3232
}
33-
3433
}

core/src/main/java/io/javaoperatorsdk/webhook/admission/AdmissionControllerException.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
public class AdmissionControllerException extends RuntimeException {
44

5-
public AdmissionControllerException() {}
5+
public AdmissionControllerException() {
6+
}
67

78
public AdmissionControllerException(String message) {
89
super(message);

core/src/main/java/io/javaoperatorsdk/webhook/admission/AdmissionRequestHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
public interface AdmissionRequestHandler {
77

88
AdmissionResponse handle(AdmissionRequest admissionRequest);
9-
109
}

core/src/main/java/io/javaoperatorsdk/webhook/admission/AdmissionUtils.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
import java.nio.charset.StandardCharsets;
44
import java.util.Base64;
55

6+
import com.fasterxml.jackson.databind.ObjectMapper;
67
import io.fabric8.kubernetes.api.model.KubernetesResource;
78
import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
89
import io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse;
910
import io.fabric8.zjsonpatch.JsonDiff;
1011

11-
import com.fasterxml.jackson.databind.ObjectMapper;
12-
1312
public class AdmissionUtils {
1413

1514
public static final String JSON_PATCH = "JSONPatch";
1615
private static final ObjectMapper mapper = new ObjectMapper();
1716

18-
private AdmissionUtils() {}
17+
private AdmissionUtils() {
18+
}
1919

2020
public static AdmissionResponse notAllowedExceptionToAdmissionResponse(
2121
NotAllowedException notAllowedException) {
22-
AdmissionResponse admissionResponse = new AdmissionResponse();
22+
var admissionResponse = new AdmissionResponse();
2323
admissionResponse.setAllowed(false);
2424
admissionResponse.setStatus(notAllowedException.getStatus());
2525
return admissionResponse;
@@ -33,17 +33,16 @@ public static KubernetesResource getTargetResource(AdmissionRequest admissionReq
3333

3434
public static AdmissionResponse admissionResponseFromMutation(KubernetesResource originalResource,
3535
KubernetesResource mutatedResource) {
36-
AdmissionResponse admissionResponse = new AdmissionResponse();
36+
var admissionResponse = new AdmissionResponse();
3737
admissionResponse.setAllowed(true);
3838
admissionResponse.setPatchType(JSON_PATCH);
3939
var originalResNode = mapper.valueToTree(originalResource);
4040
var mutatedResNode = mapper.valueToTree(mutatedResource);
4141

4242
var diff = JsonDiff.asJson(originalResNode, mutatedResNode);
43-
String base64Diff =
43+
var base64Diff =
4444
Base64.getEncoder().encodeToString(diff.toString().getBytes(StandardCharsets.UTF_8));
4545
admissionResponse.setPatch(base64Diff);
4646
return admissionResponse;
4747
}
48-
4948
}

core/src/main/java/io/javaoperatorsdk/webhook/admission/AsyncAdmissionController.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ public AsyncAdmissionController(AsyncAdmissionRequestHandler requestHandler) {
2828
public CompletionStage<AdmissionReview> handle(AdmissionReview admissionReview) {
2929
return requestHandler.handle(admissionReview.getRequest())
3030
.thenApply(r -> {
31-
AdmissionReview responseAdmissionReview = new AdmissionReview();
31+
var responseAdmissionReview = new AdmissionReview();
3232
responseAdmissionReview.setResponse(r);
3333
r.setUid(admissionReview.getRequest().getUid());
3434
return responseAdmissionReview;
3535
});
3636
}
37-
3837
}

core/src/main/java/io/javaoperatorsdk/webhook/admission/AsyncAdmissionRequestHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@
88
public interface AsyncAdmissionRequestHandler {
99

1010
CompletionStage<AdmissionResponse> handle(AdmissionRequest admissionRequest);
11-
1211
}

core/src/main/java/io/javaoperatorsdk/webhook/admission/mutation/AsyncDefaultAdmissionRequestMutator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,5 @@ public CompletionStage<AdmissionResponse> handle(AdmissionRequest admissionReque
4848
return admissionResponse;
4949
}
5050

51+
final var operation = Operation.valueOf(admissionRequest.getOperation());
5152
}

core/src/main/java/io/javaoperatorsdk/webhook/admission/mutation/AsyncMutator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@
99
public interface AsyncMutator<T extends KubernetesResource> {
1010

1111
CompletionStage<T> mutate(T resource, Operation operation) throws NotAllowedException;
12-
1312
}

core/src/main/java/io/javaoperatorsdk/webhook/admission/mutation/DefaultAdmissionRequestMutator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public DefaultAdmissionRequestMutator(Mutator<T> mutator, Cloner<T> cloner) {
3030

3131
@Override
3232
public AdmissionResponse handle(AdmissionRequest admissionRequest) {
33-
Operation operation = Operation.valueOf(admissionRequest.getOperation());
33+
var operation = Operation.valueOf(admissionRequest.getOperation());
3434
var originalResource = (T) getTargetResource(admissionRequest, operation);
3535
var clonedResource = cloner.clone(originalResource);
3636
AdmissionResponse admissionResponse;

core/src/main/java/io/javaoperatorsdk/webhook/admission/mutation/Mutator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@
1212
public interface Mutator<T extends KubernetesResource> {
1313

1414
T mutate(T resource, Operation operation) throws NotAllowedException;
15-
1615
}

0 commit comments

Comments
 (0)