Merge pull request #2669 from metacosm/optimize-generation

fabric8io · Dec 18, 2020 · a018014 · a018014
2 parents edc20a5 + 122e357
commit a018014
Show file tree

Hide file tree

Showing 58 changed files with 18,629 additions and 52,558 deletions.
diff --git a/extensions/chaosmesh/model/src/main/resources/schema/chaosmesh-schema.json b/extensions/chaosmesh/model/src/main/resources/schema/chaosmesh-schema.json
diff --git a/extensions/knative/model/src/main/resources/schema/knative-schema.json b/extensions/knative/model/src/main/resources/schema/knative-schema.json
diff --git a/extensions/service-catalog/model/src/main/resources/schema/servicecatalog-schema.json b/extensions/service-catalog/model/src/main/resources/schema/servicecatalog-schema.json
diff --git a/extensions/tekton/model-triggers/src/main/resources/schema/tekton-schema-triggers.json b/extensions/tekton/model-triggers/src/main/resources/schema/tekton-schema-triggers.json
diff --git a/extensions/tekton/model-v1alpha1/src/main/resources/schema/tekton-schema-v1alpha1.json b/extensions/tekton/model-v1alpha1/src/main/resources/schema/tekton-schema-v1alpha1.json
diff --git a/extensions/tekton/model-v1beta1/src/main/resources/schema/tekton-schema-v1beta1.json b/extensions/tekton/model-v1beta1/src/main/resources/schema/tekton-schema-v1beta1.json
diff --git a/extensions/volumesnapshot/model/src/main/resources/schema/volumesnapshot-schema.json b/extensions/volumesnapshot/model/src/main/resources/schema/volumesnapshot-schema.json
@@ -4,17 +4,14 @@
   "definitions": {
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshot": {
       "type": "object",
-      "description": "",
       "properties": {
         "apiVersion": {
           "type": "string",
-          "description": "",
           "default": "snapshot.storage.k8s.io/v1beta1",
           "required": true
         },
         "kind": {
           "type": "string",
-          "description": "",
           "default": "VolumeSnapshot",
           "required": true
         },
@@ -38,25 +35,20 @@
     },
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotClass": {
       "type": "object",
-      "description": "",
       "properties": {
         "apiVersion": {
           "type": "string",
-          "description": "",
           "default": "snapshot.storage.k8s.io/v1beta1",
           "required": true
         },
         "deletionPolicy": {
-          "type": "string",
-          "description": ""
+          "type": "string"
         },
         "driver": {
-          "type": "string",
-          "description": ""
+          "type": "string"
         },
         "kind": {
           "type": "string",
-          "description": "",
           "default": "VolumeSnapshotClass",
           "required": true
         },
@@ -65,7 +57,6 @@
         },
         "parameters": {
           "type": "object",
-          "description": "",
           "existingJavaType": "java.util.Map\u003cString,String\u003e"
         }
       },
@@ -76,25 +67,21 @@
     },
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotClassList": {
       "type": "object",
-      "description": "",
       "properties": {
         "apiVersion": {
           "type": "string",
-          "description": "",
           "default": "snapshot.storage.k8s.io/v1beta1",
           "required": true
         },
         "items": {
           "type": "array",
-          "description": "",
           "items": {
             "$ref": "#/definitions/github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotClass",
             "existingJavaType": "io.fabric8.volumesnapshot.api.model.VolumeSnapshotClass"
           }
         },
         "kind": {
           "type": "string",
-          "description": "",
           "default": "VolumeSnapshotClassList",
           "required": true
         },
@@ -110,17 +97,14 @@
     },
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotContent": {
       "type": "object",
-      "description": "",
       "properties": {
         "apiVersion": {
           "type": "string",
-          "description": "",
           "default": "snapshot.storage.k8s.io/v1beta1",
           "required": true
         },
         "kind": {
           "type": "string",
-          "description": "",
           "default": "VolumeSnapshotContent",
           "required": true
         },
@@ -143,25 +127,21 @@
     },
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotContentList": {
       "type": "object",
-      "description": "",
       "properties": {
         "apiVersion": {
           "type": "string",
-          "description": "",
           "default": "snapshot.storage.k8s.io/v1beta1",
           "required": true
         },
         "items": {
           "type": "array",
-          "description": "",
           "items": {
             "$ref": "#/definitions/github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotContent",
             "existingJavaType": "io.fabric8.volumesnapshot.api.model.VolumeSnapshotContent"
           }
         },
         "kind": {
           "type": "string",
-          "description": "",
           "default": "VolumeSnapshotContentList",
           "required": true
         },
@@ -177,16 +157,13 @@
     },
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotContentSource": {
       "type": "object",
-      "description": "",
       "properties": {
         "snapshotHandle": {
           "type": "string",
-          "description": "",
           "existingJavaType": "String"
         },
         "volumeHandle": {
           "type": "string",
-          "description": "",
           "existingJavaType": "String"
         }
       },
@@ -197,23 +174,19 @@
     },
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotContentSpec": {
       "type": "object",
-      "description": "",
       "properties": {
         "deletionPolicy": {
-          "type": "string",
-          "description": ""
+          "type": "string"
         },
         "driver": {
-          "type": "string",
-          "description": ""
+          "type": "string"
         },
         "source": {
           "$ref": "#/definitions/github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotContentSource",
           "existingJavaType": "io.fabric8.volumesnapshot.api.model.VolumeSnapshotContentSource"
         },
         "volumeSnapshotClassName": {
           "type": "string",
-          "description": "",
           "existingJavaType": "String"
         },
         "volumeSnapshotRef": {
@@ -227,11 +200,9 @@
     },
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotContentStatus": {
       "type": "object",
-      "description": "",
       "properties": {
         "creationTime": {
           "type": "integer",
-          "description": "",
           "existingJavaType": "Long"
         },
         "error": {
@@ -240,17 +211,14 @@
         },
         "readyToUse": {
           "type": "boolean",
-          "description": "",
           "existingJavaType": "Boolean"
         },
         "restoreSize": {
           "type": "integer",
-          "description": "",
           "existingJavaType": "Long"
         },
         "snapshotHandle": {
           "type": "string",
-          "description": "",
           "existingJavaType": "String"
         }
       },
@@ -261,11 +229,9 @@
     },
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotError": {
       "type": "object",
-      "description": "",
       "properties": {
         "message": {
           "type": "string",
-          "description": "",
           "existingJavaType": "String"
         },
         "time": {
@@ -279,25 +245,21 @@
     },
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotList": {
       "type": "object",
-      "description": "",
       "properties": {
         "apiVersion": {
           "type": "string",
-          "description": "",
           "default": "snapshot.storage.k8s.io/v1beta1",
           "required": true
         },
         "items": {
           "type": "array",
-          "description": "",
           "items": {
             "$ref": "#/definitions/github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshot",
             "existingJavaType": "io.fabric8.volumesnapshot.api.model.VolumeSnapshot"
           }
         },
         "kind": {
           "type": "string",
-          "description": "",
           "default": "VolumeSnapshotList",
           "required": true
         },
@@ -313,16 +275,13 @@
     },
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotSource": {
       "type": "object",
-      "description": "",
       "properties": {
         "persistentVolumeClaimName": {
           "type": "string",
-          "description": "",
           "existingJavaType": "String"
         },
         "volumeSnapshotContentName": {
           "type": "string",
-          "description": "",
           "existingJavaType": "String"
         }
       },
@@ -333,15 +292,13 @@
     },
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotSpec": {
       "type": "object",
-      "description": "",
       "properties": {
         "source": {
           "$ref": "#/definitions/github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotSource",
           "existingJavaType": "io.fabric8.volumesnapshot.api.model.VolumeSnapshotSource"
         },
         "volumeSnapshotClassName": {
           "type": "string",
-          "description": "",
           "existingJavaType": "String"
         }
       },
@@ -352,11 +309,9 @@
     },
     "github_com_kubernetes-csi_external-snapshotter_v2_pkg_apis_volumesnapshot_v1beta1_VolumeSnapshotStatus": {
       "type": "object",
-      "description": "",
       "properties": {
         "boundVolumeSnapshotContentName": {
           "type": "string",
-          "description": "",
           "existingJavaType": "String"
         },
         "creationTime": {
@@ -368,7 +323,6 @@
         },
         "readyToUse": {
           "type": "boolean",
-          "description": "",
           "existingJavaType": "Boolean"
         },
         "restoreSize": {

diff --git a/generator/pkg/schemagen/generate.go b/generator/pkg/schemagen/generate.go
@@ -53,9 +53,9 @@ type Constraint struct {
 type CrdScope int32
 
 const (
-	Namespaced CrdScope = 0
-	Cluster    CrdScope = 1
-	BasePackage string = "io.fabric8.kubernetes.api.model"
+	Namespaced  CrdScope = 0
+	Cluster     CrdScope = 1
+	BasePackage string   = "io.fabric8.kubernetes.api.model"
 )
 
 func GenerateSchema(schemaId string, crdLists map[reflect.Type]CrdScope, providedPackages map[string]string, manualTypeMap map[reflect.Type]string, packageMapping map[string]PackageInformation, mappingSchema map[string]string, providedTypes []ProvidedType, constraints map[reflect.Type]map[string]*Constraint) string {
@@ -289,11 +289,11 @@ func (g *schemaGenerator) generate(schemaId string, crdLists map[reflect.Type]Cr
 		}
 		javaType := g.javaType(k)
 		if strings.HasPrefix(javaType, "io.fabric8.") {
-			value.JavaTypeDescriptor = &JavaTypeDescriptor {
+			value.JavaTypeDescriptor = &JavaTypeDescriptor{
 				JavaType: javaType,
 			}
 		} else {
-			value.ExistingJavaTypeDescriptor = &ExistingJavaTypeDescriptor {
+			value.ExistingJavaTypeDescriptor = &ExistingJavaTypeDescriptor{
 				ExistingJavaType: javaType,
 			}
 		}
@@ -623,7 +623,10 @@ func (g *schemaGenerator) propertyDescriptorForSimpleField(field reflect.StructF
 	}
 
 	// add description
-	propertyDescriptor.Description = g.fieldDescription(field)
+	description := g.fieldDescription(field)
+	if len(description) > 0 {
+		propertyDescriptor.Description = description
+	}
 
 	return propertyDescriptor
 }
@@ -663,8 +666,8 @@ func (g *schemaGenerator) propertyDescriptorForObject(field reflect.StructField)
 	g.handleType(fieldType)
 
 	return JSONPropertyDescriptor{
-		JSONReferenceDescriptor:         g.referenceDescriptor(fieldType),
-		ExistingJavaTypeDescriptor:      g.existingJavaTypeDescriptor(fieldType),
+		JSONReferenceDescriptor:    g.referenceDescriptor(fieldType),
+		ExistingJavaTypeDescriptor: g.existingJavaTypeDescriptor(fieldType),
 	}
 }
 

diff --git a/generator/pkg/schemagen/json.go b/generator/pkg/schemagen/json.go
@@ -26,7 +26,7 @@ type JSONSchema struct {
 
 type JSONDescriptor struct {
 	Type          string        `json:"type"`
-	Description   string        `json:"description"`
+	Description   string        `json:"description,omitempty"`
 	Default       string        `json:"default,omitempty"`
 	Required      bool          `json:"required,omitempty"`
 	Minimum       float32       `json:"minimum,omitempty"`