diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/AbstractJsonSchema.java b/crd-generator/api/src/main/java/io/fabric8/crd/generator/AbstractJsonSchema.java
index 285e45254b2..76759ca3511 100644
--- a/crd-generator/api/src/main/java/io/fabric8/crd/generator/AbstractJsonSchema.java
+++ b/crd-generator/api/src/main/java/io/fabric8/crd/generator/AbstractJsonSchema.java
@@ -17,7 +17,6 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-
 import io.fabric8.crd.generator.annotation.SchemaSwap;
 import io.fabric8.crd.generator.utils.Types;
 import io.fabric8.kubernetes.api.model.Duration;
@@ -198,7 +197,7 @@ private void extractSchemaSwaps(ClassRef definitionType, AnnotationRef annotatio
       case ANNOTATION_SCHEMA_SWAPS:
         Map<String, Object> params = annotation.getParameters();
         Object[] values = (Object[]) params.get("value");
-        for (Object value :  values) {
+        for (Object value : values) {
           extractSchemaSwap(definitionType, value, schemaSwaps);
         }
         break;
@@ -209,17 +208,17 @@ private void extractSchemaSwap(ClassRef definitionType, Object annotation, Inter
     if (annotation instanceof SchemaSwap) {
       SchemaSwap schemaSwap = (SchemaSwap) annotation;
       schemaSwaps.registerSwap(definitionType,
-        extractClassRef(schemaSwap.originalType()),
-        schemaSwap.fieldName(),
-        extractClassRef(schemaSwap.targetType()));
+          extractClassRef(schemaSwap.originalType()),
+          schemaSwap.fieldName(),
+          extractClassRef(schemaSwap.targetType()));
 
     } else if (annotation instanceof AnnotationRef
         && ((AnnotationRef) annotation).getClassRef().getFullyQualifiedName().equals(ANNOTATION_SCHEMA_SWAP)) {
       Map<String, Object> params = ((AnnotationRef) annotation).getParameters();
       schemaSwaps.registerSwap(definitionType,
-        extractClassRef(params.get("originalType")),
-        (String) params.get("fieldName"),
-        extractClassRef(params.get("targetType")));
+          extractClassRef(params.get("originalType")),
+          (String) params.get("fieldName"),
+          extractClassRef(params.get("targetType")));
 
     } else {
       throw new IllegalArgumentException("Unmanaged annotation type passed to the SchemaSwaps: " + annotation);
@@ -228,8 +227,8 @@ private void extractSchemaSwap(ClassRef definitionType, Object annotation, Inter
 
   private void validateRemainingSchemaSwaps(InternalSchemaSwaps schemaSwaps) {
     String unmatchedSchemaSwaps = schemaSwaps.getUnusedSwaps()
-      .map(Object::toString)
-      .collect(Collectors.joining(","));
+        .map(Object::toString)
+        .collect(Collectors.joining(","));
     if (!unmatchedSchemaSwaps.isEmpty()) {
       throw new IllegalArgumentException("Unmatched SchemaSwaps: " + unmatchedSchemaSwaps);
     }
diff --git a/crd-generator/api/src/main/java/io/fabric8/crd/generator/InternalSchemaSwaps.java b/crd-generator/api/src/main/java/io/fabric8/crd/generator/InternalSchemaSwaps.java
index d5b44df287e..de8abd3bce3 100644
--- a/crd-generator/api/src/main/java/io/fabric8/crd/generator/InternalSchemaSwaps.java
+++ b/crd-generator/api/src/main/java/io/fabric8/crd/generator/InternalSchemaSwaps.java
@@ -15,6 +15,8 @@
  */
 package io.fabric8.crd.generator;
 
+import io.sundr.model.ClassRef;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -22,8 +24,6 @@
 import java.util.StringJoiner;
 import java.util.stream.Stream;
 
-import io.sundr.model.ClassRef;
-
 public class InternalSchemaSwaps {
   private final Map<Key, Value> swaps = new HashMap<>();
 
@@ -50,7 +50,6 @@ private static class Key {
     private final ClassRef originalType;
     private final String fieldName;
 
-
     public Key(ClassRef originalType, String fieldName) {
       this.originalType = originalType;
       this.fieldName = fieldName;
@@ -84,9 +83,9 @@ public int hashCode() {
     @Override
     public String toString() {
       return new StringJoiner(", ", Key.class.getSimpleName() + "[", "]")
-        .add("originalType=" + originalType)
-        .add("fieldName='" + fieldName + "'")
-        .toString();
+          .add("originalType=" + originalType)
+          .add("fieldName='" + fieldName + "'")
+          .toString();
     }
   }
 
@@ -127,7 +126,8 @@ public boolean isUsed() {
 
     @Override
     public String toString() {
-      return "@SchemaSwap(originalType=" + originalType + ", fieldName=\"" + fieldName + "\", targetType="+targetType + ") on " + definitionType;
+      return "@SchemaSwap(originalType=" + originalType + ", fieldName=\"" + fieldName + "\", targetType=" + targetType
+          + ") on " + definitionType;
     }
   }
 }
diff --git a/crd-generator/api/src/test/java/io/fabric8/crd/example/extraction/MultipleSchemaSwaps.java b/crd-generator/api/src/test/java/io/fabric8/crd/example/extraction/MultipleSchemaSwaps.java
index f8143927cfa..88a4e09e653 100644
--- a/crd-generator/api/src/test/java/io/fabric8/crd/example/extraction/MultipleSchemaSwaps.java
+++ b/crd-generator/api/src/test/java/io/fabric8/crd/example/extraction/MultipleSchemaSwaps.java
@@ -20,6 +20,6 @@
 
 @SchemaSwap(originalType = SchemaSwapSpec.SomeObject.class, fieldName = "shouldBeString", targetType = String.class)
 @SchemaSwap(originalType = SchemaSwapSpec.AnotherObject.class, fieldName = "shouldBeInt", targetType = Integer.class)
-public class MultipleSchemaSwaps extends  CustomResource<SchemaSwapSpec, Void> {
+public class MultipleSchemaSwaps extends CustomResource<SchemaSwapSpec, Void> {
 
 }
diff --git a/crd-generator/api/src/test/java/io/fabric8/crd/generator/v1/JsonSchemaTest.java b/crd-generator/api/src/test/java/io/fabric8/crd/generator/v1/JsonSchemaTest.java
index 87ee85e6a41..da32ce91ff5 100644
--- a/crd-generator/api/src/test/java/io/fabric8/crd/generator/v1/JsonSchemaTest.java
+++ b/crd-generator/api/src/test/java/io/fabric8/crd/generator/v1/JsonSchemaTest.java
@@ -18,11 +18,11 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import io.fabric8.crd.example.annotated.Annotated;
 import io.fabric8.crd.example.basic.Basic;
+import io.fabric8.crd.example.extraction.Extraction;
 import io.fabric8.crd.example.extraction.IncorrectExtraction;
 import io.fabric8.crd.example.extraction.IncorrectExtraction2;
 import io.fabric8.crd.example.extraction.MultipleSchemaSwaps;
 import io.fabric8.crd.example.json.ContainingJson;
-import io.fabric8.crd.example.extraction.Extraction;
 import io.fabric8.crd.example.person.Person;
 import io.fabric8.crd.generator.utils.Types;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps;
@@ -45,16 +45,16 @@ void shouldCreateJsonSchemaFromClass() {
     Map<String, JSONSchemaProps> properties = schema.getProperties();
     assertEquals(7, properties.size());
     final List<String> personTypes = properties.get("type").getEnum().stream().map(JsonNode::asText)
-      .collect(Collectors.toList());
+        .collect(Collectors.toList());
     assertEquals(2, personTypes.size());
     assertTrue(personTypes.contains("crazy"));
     assertTrue(personTypes.contains("crazier"));
     final Map<String, JSONSchemaProps> addressProperties = properties.get("addresses").getItems()
-      .getSchema().getProperties();
+        .getSchema().getProperties();
     assertEquals(5, addressProperties.size());
     final List<String> addressTypes = addressProperties.get("type").getEnum().stream()
-      .map(JsonNode::asText)
-      .collect(Collectors.toList());
+        .map(JsonNode::asText)
+        .collect(Collectors.toList());
     assertEquals(2, addressTypes.size());
     assertTrue(addressTypes.contains("home"));
     assertTrue(addressTypes.contains("work"));
@@ -179,7 +179,6 @@ void shouldExtractPropertiesSchemaFromExtractValueAnnotation() {
     assertNull(barProps.get("baz"));
   }
 
-
   @Test
   void shouldExtractPropertiesSchemaFromSchemaSwapAnnotations() {
     TypeDef extraction = Types.typeDefFrom(MultipleSchemaSwaps.class);
@@ -216,16 +215,22 @@ void shouldExtractPropertiesSchemaFromSchemaSwapAnnotations() {
   @Test
   void shouldThrowIfSchemaSwapHasUnmatchedField() {
     TypeDef incorrectExtraction = Types.typeDefFrom(IncorrectExtraction.class);
-    IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> JsonSchema.from(incorrectExtraction));
-    assertEquals("Unmatched SchemaSwaps: @SchemaSwap(originalType=io.fabric8.crd.example.extraction.ExtractionSpec, fieldName=\"FOO\", targetType=io"
-      + ".fabric8.crd.example.extraction.FooExtractor) on io.fabric8.crd.example.extraction.IncorrectExtraction", exception.getMessage());
+    IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+        () -> JsonSchema.from(incorrectExtraction));
+    assertEquals(
+        "Unmatched SchemaSwaps: @SchemaSwap(originalType=io.fabric8.crd.example.extraction.ExtractionSpec, fieldName=\"FOO\", targetType=io"
+            + ".fabric8.crd.example.extraction.FooExtractor) on io.fabric8.crd.example.extraction.IncorrectExtraction",
+        exception.getMessage());
   }
 
   @Test
   void shouldThrowIfSchemaSwapHasUnmatchedClass() {
     TypeDef incorrectExtraction2 = Types.typeDefFrom(IncorrectExtraction2.class);
-    IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> JsonSchema.from(incorrectExtraction2));
-    assertEquals("Unmatched SchemaSwaps: @SchemaSwap(originalType=io.fabric8.crd.example.basic.BasicSpec, fieldName=\"bar\", targetType=io.fabric8.crd"
-      + ".example.extraction.FooExtractor) on io.fabric8.crd.example.extraction.IncorrectExtraction2", exception.getMessage());
+    IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+        () -> JsonSchema.from(incorrectExtraction2));
+    assertEquals(
+        "Unmatched SchemaSwaps: @SchemaSwap(originalType=io.fabric8.crd.example.basic.BasicSpec, fieldName=\"bar\", targetType=io.fabric8.crd"
+            + ".example.extraction.FooExtractor) on io.fabric8.crd.example.extraction.IncorrectExtraction2",
+        exception.getMessage());
   }
 }
diff --git a/crd-generator/test/src/test/java/io/fabric8/crd/generator/schemaswaps/MultipleSchemaSwaps.java b/crd-generator/test/src/test/java/io/fabric8/crd/generator/schemaswaps/MultipleSchemaSwaps.java
index 4e78b23e87f..81bc6c21849 100644
--- a/crd-generator/test/src/test/java/io/fabric8/crd/generator/schemaswaps/MultipleSchemaSwaps.java
+++ b/crd-generator/test/src/test/java/io/fabric8/crd/generator/schemaswaps/MultipleSchemaSwaps.java
@@ -24,6 +24,6 @@
 @Group("acme.com")
 @SchemaSwap(originalType = SchemaSwapSpec.SomeObject.class, fieldName = "shouldBeString", targetType = String.class)
 @SchemaSwap(originalType = SchemaSwapSpec.AnotherObject.class, fieldName = "shouldBeInt", targetType = Integer.class)
-public class MultipleSchemaSwaps extends  CustomResource<SchemaSwapSpec, Void> {
+public class MultipleSchemaSwaps extends CustomResource<SchemaSwapSpec, Void> {
 
 }
diff --git a/crd-generator/test/src/test/java/io/fabric8/crd/generator/schemaswaps/SchemaSwapCRDTest.java b/crd-generator/test/src/test/java/io/fabric8/crd/generator/schemaswaps/SchemaSwapCRDTest.java
index 2819b0cf134..a17153d3938 100644
--- a/crd-generator/test/src/test/java/io/fabric8/crd/generator/schemaswaps/SchemaSwapCRDTest.java
+++ b/crd-generator/test/src/test/java/io/fabric8/crd/generator/schemaswaps/SchemaSwapCRDTest.java
@@ -15,16 +15,15 @@
  */
 package io.fabric8.crd.generator.schemaswaps;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.junit.jupiter.api.Test;
-
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionVersion;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps;
 import io.fabric8.kubernetes.client.utils.Serialization;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;