Skip to content

Commit 78397e0

Browse files
DonnerbartDonnerbart
committed
refactor: fix imports
Signed-off-by: David Sondermann <[email protected]>
1 parent 4c051dd commit 78397e0

File tree

19 files changed

+56
-34
lines changed

19 files changed

+56
-34
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
import java.nio.charset.StandardCharsets;
44
import java.util.Base64;
55

6-
import com.fasterxml.jackson.databind.ObjectMapper;
76
import io.fabric8.kubernetes.api.model.KubernetesResource;
87
import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
98
import io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse;
109
import io.fabric8.zjsonpatch.JsonDiff;
1110

11+
import com.fasterxml.jackson.databind.ObjectMapper;
12+
1213
public class AdmissionUtils {
1314

1415
public static final String JSON_PATCH = "JSONPatch";

‎core/src/main/java/io/javaoperatorsdk/webhook/conversion/AsyncConversionController.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
import java.util.concurrent.CompletionStage;
99
import java.util.stream.Collectors;
1010

11-
import io.fabric8.kubernetes.api.model.HasMetadata;
12-
import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionReview;
1311
import org.slf4j.Logger;
1412
import org.slf4j.LoggerFactory;
1513

14+
import io.fabric8.kubernetes.api.model.HasMetadata;
15+
import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionReview;
16+
1617
import static io.javaoperatorsdk.webhook.conversion.Commons.MAPPER_ALREADY_REGISTERED_FOR_VERSION_MESSAGE;
1718
import static io.javaoperatorsdk.webhook.conversion.Commons.createErrorResponse;
1819
import static io.javaoperatorsdk.webhook.conversion.Commons.createResponse;

‎core/src/main/java/io/javaoperatorsdk/webhook/conversion/ConversionController.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
import java.util.Map;
66
import java.util.stream.Collectors;
77

8-
import io.fabric8.kubernetes.api.model.HasMetadata;
9-
import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionReview;
108
import org.slf4j.Logger;
119
import org.slf4j.LoggerFactory;
1210

11+
import io.fabric8.kubernetes.api.model.HasMetadata;
12+
import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionReview;
13+
1314
import static io.javaoperatorsdk.webhook.conversion.Commons.MAPPER_ALREADY_REGISTERED_FOR_VERSION_MESSAGE;
1415
import static io.javaoperatorsdk.webhook.conversion.Commons.createErrorResponse;
1516
import static io.javaoperatorsdk.webhook.conversion.Commons.createResponse;

‎core/src/test/java/io/javaoperatorsdk/webhook/admission/AdmissionControllerTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package io.javaoperatorsdk.webhook.admission;
22

3+
import org.junit.jupiter.api.Test;
4+
35
import io.fabric8.kubernetes.api.model.HasMetadata;
46
import io.javaoperatorsdk.webhook.admission.mutation.Mutator;
57
import io.javaoperatorsdk.webhook.admission.validation.Validator;
6-
import org.junit.jupiter.api.Test;
78

89
import static io.javaoperatorsdk.webhook.admission.AdmissionTestSupport.LABEL_TEST_VALUE;
910
import static io.javaoperatorsdk.webhook.admission.AdmissionTestSupport.MISSING_REQUIRED_LABEL;

‎core/src/test/java/io/javaoperatorsdk/webhook/admission/AdmissionTestSupport.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
import java.util.UUID;
66
import java.util.function.Function;
77

8+
import org.assertj.core.api.AbstractThrowableAssert;
9+
import org.assertj.core.api.Assertions;
10+
811
import io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest;
912
import io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview;
1013
import io.fabric8.kubernetes.api.model.apps.Deployment;
1114
import io.fabric8.kubernetes.client.utils.Serialization;
12-
import org.assertj.core.api.AbstractThrowableAssert;
13-
import org.assertj.core.api.Assertions;
1415

1516
import static org.assertj.core.api.Assertions.assertThat;
1617

‎core/src/test/java/io/javaoperatorsdk/webhook/admission/AsyncAdmissionControllerTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
import java.util.concurrent.CompletableFuture;
44
import java.util.concurrent.CompletionException;
55

6+
import org.junit.jupiter.api.Test;
7+
68
import io.fabric8.kubernetes.api.model.HasMetadata;
79
import io.javaoperatorsdk.webhook.admission.mutation.AsyncMutator;
810
import io.javaoperatorsdk.webhook.admission.mutation.Mutator;
911
import io.javaoperatorsdk.webhook.admission.validation.Validator;
10-
import org.junit.jupiter.api.Test;
1112

1213
import static io.javaoperatorsdk.webhook.admission.AdmissionTestSupport.LABEL_KEY;
1314
import static io.javaoperatorsdk.webhook.admission.AdmissionTestSupport.LABEL_TEST_VALUE;

‎core/src/test/java/io/javaoperatorsdk/webhook/conversion/AsyncConversionControllerTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
import java.util.concurrent.ExecutionException;
44
import java.util.function.Function;
55

6+
import org.junit.jupiter.api.BeforeEach;
7+
import org.junit.jupiter.api.Test;
8+
69
import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionResponse;
710
import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionReview;
811
import io.javaoperatorsdk.webhook.conversion.mapper.AsyncV1Mapper;
912
import io.javaoperatorsdk.webhook.conversion.mapper.AsyncV2Mapper;
1013
import io.javaoperatorsdk.webhook.conversion.mapper.AsyncV3Mapper;
11-
import org.junit.jupiter.api.BeforeEach;
12-
import org.junit.jupiter.api.Test;
1314

1415
class AsyncConversionControllerTest {
1516

‎core/src/test/java/io/javaoperatorsdk/webhook/conversion/ConversionControllerTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
import java.util.function.Function;
44

5+
import org.junit.jupiter.api.BeforeEach;
6+
import org.junit.jupiter.api.Test;
7+
58
import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionResponse;
69
import io.fabric8.kubernetes.api.model.apiextensions.v1.ConversionReview;
710
import io.javaoperatorsdk.webhook.conversion.mapper.CustomResourceV1Mapper;
811
import io.javaoperatorsdk.webhook.conversion.mapper.CustomResourceV2Mapper;
912
import io.javaoperatorsdk.webhook.conversion.mapper.CustomResourceV3Mapper;
10-
import org.junit.jupiter.api.BeforeEach;
11-
import org.junit.jupiter.api.Test;
1213

1314
public class ConversionControllerTest {
1415

‎samples/commons/src/test/java/io/javaoperatorsdk/webhook/sample/AbstractEndToEndTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
import java.util.concurrent.TimeUnit;
55
import java.util.function.Supplier;
66

7+
import org.junit.jupiter.api.Test;
8+
79
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
810
import io.fabric8.kubernetes.client.KubernetesClient;
911
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
1012
import io.fabric8.kubernetes.client.KubernetesClientException;
1113
import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResource;
1214
import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResourceSpec;
1315
import io.javaoperatorsdk.webhook.sample.commons.customresource.MultiVersionCustomResourceV2;
14-
import org.junit.jupiter.api.Test;
1516

1617
import static io.javaoperatorsdk.webhook.sample.commons.AdmissionControllers.MUTATION_TARGET_LABEL;
1718
import static io.javaoperatorsdk.webhook.sample.commons.Utils.SPIN_UP_GRACE_PERIOD;

‎samples/quarkus/src/main/java/io/javaoperatorsdk/webhook/sample/conversion/ConversionControllerConfig.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.javaoperatorsdk.webhook.conversion.AsyncConversionController;
44
import io.javaoperatorsdk.webhook.conversion.ConversionController;
55
import io.javaoperatorsdk.webhook.sample.commons.ConversionControllers;
6+
67
import jakarta.inject.Singleton;
78

89
public class ConversionControllerConfig {

0 commit comments

Comments
 (0)