Merge pull request #1752 from gastaldi/remove_validator

fabric8io · Sep 11, 2019 · 7f1ed14 · 7f1ed14
2 parents 652d031 + 8e2381b
commit 7f1ed14
Show file tree

Hide file tree

Showing 26 changed files with 15 additions and 354 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,8 @@
 #### Bugs
 
 #### Improvements
-
+  * Removed Bean Validation integration
+
 #### Dependency Upgrade
 
 #### New Feature

diff --git a/extensions/knative/annotator/src/main/java/io/fabric8/knative/KnativeTypeAnnotator.java b/extensions/knative/annotator/src/main/java/io/fabric8/knative/KnativeTypeAnnotator.java
@@ -56,7 +56,7 @@ public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) {
         try {
             JAnnotationUse buildable = clazz.annotate(Buildable.class)
                     .param("editableEnabled", false)
-                    .param("validationEnabled", true)
+                    .param("validationEnabled", false)
                     .param("generateBuilderPackage", false)
                     .param("builderPackage", "io.fabric8.kubernetes.api.builder");
 

diff --git a/extensions/knative/client/pom.xml b/extensions/knative/client/pom.xml
@@ -62,10 +62,6 @@
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jaxb-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>

diff --git a/extensions/service-catalog/client/pom.xml b/extensions/service-catalog/client/pom.xml
@@ -42,7 +42,6 @@
     </osgi.export>
 
     <jsonassert.version>1.2.3</jsonassert.version>
-    <validation-api.version>1.1.0.Final</validation-api.version>
   </properties>
 
   <dependencies>
@@ -69,11 +68,6 @@
       <artifactId>jackson-module-jaxb-annotations</artifactId>
       <version>2.6.3</version>
     </dependency>
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <version>${validation-api.version}</version>
-    </dependency>
     <dependency>
       <groupId>io.sundr</groupId>
       <artifactId>builder-annotations</artifactId>

diff --git a/...sions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/CodgeGen.java b/...sions/service-catalog/client/src/main/java/io/fabric8/servicecatalog/client/CodgeGen.java
diff --git a/extensions/service-catalog/model/pom.xml b/extensions/service-catalog/model/pom.xml
@@ -61,7 +61,6 @@
     <mockwebserver.version>0.1.0</mockwebserver.version>
 
     <slf4j.version>1.7.12</slf4j.version>
-    <validation-api.version>1.1.0.Final</validation-api.version>
 
     <scr.annotations.version>1.9.2</scr.annotations.version>
     <sundrio.version>0.17.2</sundrio.version>
@@ -127,11 +126,6 @@
         <artifactId>jackson-module-jaxb-annotations</artifactId>
         <version>${jackson.version}</version>
       </dependency>
-      <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>${validation-api.version}</version>
-      </dependency>
       <dependency>
         <groupId>io.sundr</groupId>
         <artifactId>builder-annotations</artifactId>

diff --git a/...otator/src/main/java/io/fabric8/servicecatalog/annotator/ServiceCatalogTypeAnnotator.java b/...otator/src/main/java/io/fabric8/servicecatalog/annotator/ServiceCatalogTypeAnnotator.java
@@ -49,7 +49,7 @@ public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) {
         try {
             JAnnotationUse buildable = clazz.annotate(Buildable.class)
                     .param("editableEnabled", false)
-                    .param("validationEnabled", true)
+                    .param("validationEnabled", false)
                     .param("generateBuilderPackage", false)
                     .param("builderPackage", "io.fabric8.kubernetes.api.builder");
 

diff --git a/extensions/service-catalog/model/servicecatalog-model/pom.xml b/extensions/service-catalog/model/servicecatalog-model/pom.xml
@@ -73,10 +73,6 @@
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jaxb-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>

diff --git a/extensions/tekton/annotator/src/main/java/io/fabric8/tekton/TektonTypeAnnotator.java b/extensions/tekton/annotator/src/main/java/io/fabric8/tekton/TektonTypeAnnotator.java
@@ -56,7 +56,7 @@ public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) {
         try {
             JAnnotationUse buildable = clazz.annotate(Buildable.class)
                     .param("editableEnabled", false)
-                    .param("validationEnabled", true)
+                    .param("validationEnabled", false)
                     .param("generateBuilderPackage", false)
                     .param("builderPackage", "io.fabric8.kubernetes.api.builder");
 

diff --git a/extensions/tekton/client/pom.xml b/extensions/tekton/client/pom.xml
@@ -62,10 +62,6 @@
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-jaxb-annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/CustomResourceDoneable.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/CustomResourceDoneable.java
@@ -17,7 +17,6 @@
 
 import io.fabric8.kubernetes.api.builder.Function;
 import io.fabric8.kubernetes.api.model.Doneable;
-import io.fabric8.kubernetes.api.model.HasMetadata;
 
 /**
  */

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/CustomResourceList.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/CustomResourceList.java
@@ -22,8 +22,6 @@
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.ListMeta;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,17 +30,16 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 public class CustomResourceList<T extends HasMetadata> implements KubernetesResource, KubernetesResourceList<T> {
 
-  @NotNull
   @JsonProperty("apiVersion")
   private String apiVersion;
+
   @JsonProperty("items")
-  @Valid
   private List<T> items = new ArrayList<T>();
-  @NotNull
+
   @JsonProperty("kind")
   private String kind;
+
   @JsonProperty("metadata")
-  @Valid
   private ListMeta metadata;
 
   public String getApiVersion() {

diff --git a/...odel-annotator/src/main/java/io/fabric8/kubernetes/annotator/KubernetesTypeAnnotator.java b/...odel-annotator/src/main/java/io/fabric8/kubernetes/annotator/KubernetesTypeAnnotator.java
@@ -74,16 +74,14 @@ public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) {
         try {
             clazz.annotate(Buildable.class)
                     .param("editableEnabled", false)
-                    .param("validationEnabled", true)
+                    .param("validationEnabled", false)
                     .param("generateBuilderPackage", true)
                     .param("builderPackage", "io.fabric8.kubernetes.api.builder")
                     .annotationParam("inline", Inline.class)
                     .param("type", new JCodeModel()._class("io.fabric8.kubernetes.api.model.Doneable"))
                     .param("prefix", "Doneable")
                     .param("value", "done");
 
-            annotateMetatadataValidator(clazz);
-            envNameValidator(clazz);
         } catch (JClassAlreadyExistsException e) {
             e.printStackTrace();
         }
@@ -159,44 +157,6 @@ private String getObjectNamePattern(JDefinedClass clazz) {
         return nameIsDNS1123SubdomainPattern;
     }
 
-    private void annotateMetatadataValidator(JDefinedClass clazz) {
-        if (clazz.name().equals("PodTemplateSpec")) {
-            return;
-        }
-
-        for (Map.Entry<String, JFieldVar> f : clazz.fields().entrySet()) {
-            if (f.getKey().equals("metadata") && f.getValue().type().name().equals("ObjectMeta")) {
-                try {
-                    JAnnotationUse annotation = f.getValue().annotate(new JCodeModel()._class("io.fabric8.kubernetes.api.model.validators.CheckObjectMeta"));
-
-                    if (isMinimal(clazz)) {
-                        annotation.param("minimal", true);
-                    } else {
-                        annotation
-                            .param("regexp", "^" + getObjectNamePattern(clazz) + "$")
-                            .param("max", getObjectNameMaxLength(clazz));
-                    }
-                } catch (JClassAlreadyExistsException e) {
-                    e.printStackTrace();
-                }
-                return;
-            }
-        }
-    }
-
-    private void envNameValidator(JDefinedClass clazz) {
-        for (Map.Entry<String, JFieldVar> f : clazz.fields().entrySet()) {
-            if (f.getKey().equals("name") && f.getValue().type().name().equals("String") && clazz.name().equals("EnvVar")) {
-                for (JAnnotationUse annotation: f.getValue().annotations()) {
-                    if (annotation.getAnnotationClass().name().equals("Pattern")) {
-                        annotation.param("regexp", "^" + envNamePattern + "$");
-                    }
-                }
-                return;
-            }
-        }
-    }
-
     private boolean isMinimal(JDefinedClass clazz) {
         String kind = clazz.name();
         return kind.equals("Group") || kind.equals("User") || kind.equals("Identity") || kind.equals("UserIdentityMapping")

diff --git a/kubernetes-model/kubernetes-model/pom.xml b/kubernetes-model/kubernetes-model/pom.xml
@@ -60,27 +60,6 @@
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-jaxb-annotations</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate.validator</groupId>
-      <artifactId>hibernate-validator</artifactId>
-      <version>6.0.17.Final</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.el</groupId>
-      <artifactId>javax.el-api</artifactId>
-      <version>3.0.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish</groupId>
-      <artifactId>javax.el</artifactId>
-      <version>3.0.1-b11</version>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>

diff --git a/...tes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/IntOrString.java b/...tes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/IntOrString.java
@@ -52,7 +52,7 @@
 })
 @ToString
 @EqualsAndHashCode
-@Buildable(editableEnabled = false, validationEnabled = true, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
 public class IntOrString implements Serializable {
 
     @JsonProperty("IntVal")

diff --git a/...-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java b/...-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java
@@ -42,7 +42,7 @@
         "items",
 })
 @JsonDeserialize(using = JsonDeserializer.None.class)
-@Buildable(editableEnabled = false, validationEnabled = true, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
 public class KubernetesList extends BaseKubernetesList implements KubernetesResource {
 
     /**

diff --git a/...rnetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/Quantity.java b/...rnetes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/Quantity.java
@@ -29,7 +29,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.annotation.Generated;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -44,7 +43,7 @@
 @JsonSerialize(using = Quantity.Serializer.class)
 @ToString
 @EqualsAndHashCode
-@Buildable(editableEnabled = false, validationEnabled = true, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
 public class Quantity  implements Serializable {
 
     private String amount;

diff --git a/...etes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/WatchEvent.java b/...etes-model/kubernetes-model/src/main/java/io/fabric8/kubernetes/api/model/WatchEvent.java
@@ -28,7 +28,6 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -44,7 +43,7 @@
 @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @ToString
 @EqualsAndHashCode
-@Buildable(editableEnabled = false, validationEnabled = true, generateBuilderPackage = true, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, builderPackage = "io.fabric8.kubernetes.api.builder", inline = @Inline(type = Doneable.class, prefix = "Doneable", value = "done"))
 public class WatchEvent implements KubernetesResource
 {
 
@@ -53,7 +52,6 @@ public class WatchEvent implements KubernetesResource
    *
    */
   @JsonProperty("object")
-  @Valid
   private KubernetesResource object;
   /**
    * the type of watch event; may be ADDED

diff --git a/...netes-model/src/main/java/io/fabric8/kubernetes/api/model/validators/CheckObjectMeta.java b/...netes-model/src/main/java/io/fabric8/kubernetes/api/model/validators/CheckObjectMeta.java
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ @@
     import io.fabric8.kubernetes.api.builder.Function;
     import io.fabric8.kubernetes.api.model.Doneable;
-    import io.fabric8.kubernetes.api.model.HasMetadata;
     /**
      */
@@ Expand Down @@