Correct polymorphism in ClusterTarget/AddOnClusterTarget

Author: lucamolteni

.openapi/connector_mgmt.yaml

@@ -759,34 +759,38 @@ components:
             `GET /api/connector_mgmt/v1/kafka_connector_types/{connector_type_id}`.
 
     ClusterTarget:
+      required:
+        - kind
+      properties:
+        kind:
+          type: string
+      type: object
       discriminator:
         propertyName: kind
         mapping:
           addon: "#/components/schemas/AddonClusterTarget"
           cloud_provider: "#/components/schemas/CloudProviderClusterTarget"
-      oneOf:
-        - $ref: "#/components/schemas/AddonClusterTarget"
-        - $ref: "#/components/schemas/CloudProviderClusterTarget"
 
     AddonClusterTarget:
+      allOf:
+        - $ref: "#/components/schemas/ClusterTarget"
+        - $ref: "#/components/schemas/AddonClusterTarget_allOf"
+
+    AddonClusterTarget_allOf:
       description: "Targets workloads to an addon cluster"
       type: object
-      required:
-        - kind
       properties:
-        kind:
-          type: string
         cluster_id:
           type: string
 
     CloudProviderClusterTarget:
+      allOf:
+        - $ref: "#/components/schemas/ClusterTarget"
+        - $ref: "#/components/schemas/CloudProviderClusterTarget_allOf"
+    CloudProviderClusterTarget_allOf:
       description: "Targets workloads to a cloud provider"
       type: object
-      required:
-        - kind
       properties:
-        kind:
-          type: string
         cloud_provider:
           type: string
         region:

packages/connector-management-sdk/README.md

@@ -129,8 +129,10 @@ Class | Method | HTTP request | Description
 ## Documentation for Models
 
  - [AddonClusterTarget](docs/AddonClusterTarget.md)
+ - [AddonClusterTargetAllOf](docs/AddonClusterTargetAllOf.md)
  - [AddonParameter](docs/AddonParameter.md)
  - [CloudProviderClusterTarget](docs/CloudProviderClusterTarget.md)
+ - [CloudProviderClusterTargetAllOf](docs/CloudProviderClusterTargetAllOf.md)
  - [ClusterTarget](docs/ClusterTarget.md)
  - [Connector](docs/Connector.md)
  - [ConnectorAllOf](docs/ConnectorAllOf.md)

packages/connector-management-sdk/api/openapi.yaml

@@ -995,32 +995,35 @@ components:
           addon: '#/components/schemas/AddonClusterTarget'
           cloud_provider: '#/components/schemas/CloudProviderClusterTarget'
         propertyName: kind
-      oneOf:
-      - $ref: '#/components/schemas/AddonClusterTarget'
-      - $ref: '#/components/schemas/CloudProviderClusterTarget'
-    AddonClusterTarget:
-      description: Targets workloads to an addon cluster
       properties:
         kind:
           type: string
-        cluster_id:
-          type: string
       required:
       - kind
       type: object
+    AddonClusterTarget:
+      allOf:
+      - $ref: '#/components/schemas/ClusterTarget'
+      - $ref: '#/components/schemas/AddonClusterTarget_allOf'
+    AddonClusterTarget_allOf:
+      description: Targets workloads to an addon cluster
+      properties:
+        cluster_id:
+          type: string
+      type: object
     CloudProviderClusterTarget:
+      allOf:
+      - $ref: '#/components/schemas/ClusterTarget'
+      - $ref: '#/components/schemas/CloudProviderClusterTarget_allOf'
+    CloudProviderClusterTarget_allOf:
       description: Targets workloads to a cloud provider
       properties:
-        kind:
-          type: string
         cloud_provider:
           type: string
         region:
           type: string
         multi_az:
           type: boolean
-      required:
-      - kind
       type: object
     AddonParameterList:
       description: A list of addon parameters

packages/connector-management-sdk/docs/AddonClusterTarget.md

@@ -2,13 +2,11 @@
 
 # AddonClusterTarget
 
-Targets workloads to an addon cluster
 
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**kind** | **String** |  | 
 **clusterId** | **String** |  |  [optional]
 
 

packages/connector-management-sdk/docs/AddonClusterTargetAllOf.md

@@ -0,0 +1,14 @@
+
+
+# AddonClusterTargetAllOf
+
+Targets workloads to an addon cluster
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**clusterId** | **String** |  |  [optional]
+
+
+

packages/connector-management-sdk/docs/CloudProviderClusterTarget.md

@@ -2,13 +2,11 @@
 
 # CloudProviderClusterTarget
 
-Targets workloads to a cloud provider
 
 ## Properties
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**kind** | **String** |  | 
 **cloudProvider** | **String** |  |  [optional]
 **region** | **String** |  |  [optional]
 **multiAz** | **Boolean** |  |  [optional]

packages/connector-management-sdk/docs/CloudProviderClusterTargetAllOf.md

@@ -0,0 +1,16 @@
+
+
+# CloudProviderClusterTargetAllOf
+
+Targets workloads to a cloud provider
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cloudProvider** | **String** |  |  [optional]
+**region** | **String** |  |  [optional]
+**multiAz** | **Boolean** |  |  [optional]
+
+
+

packages/connector-management-sdk/docs/ClusterTarget.md

@@ -8,10 +8,6 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **kind** | **String** |  | 
-**clusterId** | **String** |  |  [optional]
-**cloudProvider** | **String** |  |  [optional]
-**region** | **String** |  |  [optional]
-**multiAz** | **Boolean** |  |  [optional]
 
 
 

packages/connector-management-sdk/src/main/java/com/openshift/cloud/api/connector/models/AddonClusterTarget.java

@@ -18,56 +18,37 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.JsonValue;
+import com.openshift.cloud.api.connector.models.AddonClusterTarget;
+import com.openshift.cloud.api.connector.models.AddonClusterTargetAllOf;
+import com.openshift.cloud.api.connector.models.CloudProviderClusterTarget;
+import com.openshift.cloud.api.connector.models.ClusterTarget;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 /**
- * Targets workloads to an addon cluster
+ * AddonClusterTarget
  */
-@ApiModel(description = "Targets workloads to an addon cluster")
 @JsonPropertyOrder({
-  AddonClusterTarget.JSON_PROPERTY_KIND,
   AddonClusterTarget.JSON_PROPERTY_CLUSTER_ID
 })
 @JsonTypeName("AddonClusterTarget")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
-public class AddonClusterTarget {
-  public static final String JSON_PROPERTY_KIND = "kind";
-  private String kind;
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "kind", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = AddonClusterTarget.class, name = "addon"),
+  @JsonSubTypes.Type(value = CloudProviderClusterTarget.class, name = "cloud_provider"),
+})
 
+public class AddonClusterTarget extends ClusterTarget {
   public static final String JSON_PROPERTY_CLUSTER_ID = "cluster_id";
   private String clusterId;
 
 
-  public AddonClusterTarget kind(String kind) {
-    
-    this.kind = kind;
-    return this;
-  }
-
-   /**
-   * Get kind
-   * @return kind
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_KIND)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getKind() {
-    return kind;
-  }
-
-
-  @JsonProperty(JSON_PROPERTY_KIND)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setKind(String kind) {
-    this.kind = kind;
-  }
-
-
   public AddonClusterTarget clusterId(String clusterId) {
 
     this.clusterId = clusterId;
@@ -104,20 +85,20 @@ public boolean equals(Object o) {
       return false;
     }
     AddonClusterTarget addonClusterTarget = (AddonClusterTarget) o;
-    return Objects.equals(this.kind, addonClusterTarget.kind) &&
-        Objects.equals(this.clusterId, addonClusterTarget.clusterId);
+    return Objects.equals(this.clusterId, addonClusterTarget.clusterId) &&
+        super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(kind, clusterId);
+    return Objects.hash(clusterId, super.hashCode());
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class AddonClusterTarget {\n");
-    sb.append("    kind: ").append(toIndentedString(kind)).append("\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    clusterId: ").append(toIndentedString(clusterId)).append("\n");
     sb.append("}");
     return sb.toString();

packages/connector-management-sdk/src/main/java/com/openshift/cloud/api/connector/models/AddonClusterTargetAllOf.java

@@ -0,0 +1,106 @@
+/*
+ * Connector Service Fleet Manager
+ * Connector Service Fleet Manager is a Rest API to manage connectors.
+ *
+ * The version of the OpenAPI document: 0.0.3
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package com.openshift.cloud.api.connector.models;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * Targets workloads to an addon cluster
+ */
+@ApiModel(description = "Targets workloads to an addon cluster")
+@JsonPropertyOrder({
+  AddonClusterTargetAllOf.JSON_PROPERTY_CLUSTER_ID
+})
+@JsonTypeName("AddonClusterTarget_allOf")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class AddonClusterTargetAllOf {
+  public static final String JSON_PROPERTY_CLUSTER_ID = "cluster_id";
+  private String clusterId;
+
+
+  public AddonClusterTargetAllOf clusterId(String clusterId) {
+    
+    this.clusterId = clusterId;
+    return this;
+  }
+
+   /**
+   * Get clusterId
+   * @return clusterId
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+  @JsonProperty(JSON_PROPERTY_CLUSTER_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+
+  public String getClusterId() {
+    return clusterId;
+  }
+
+
+  @JsonProperty(JSON_PROPERTY_CLUSTER_ID)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setClusterId(String clusterId) {
+    this.clusterId = clusterId;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AddonClusterTargetAllOf addonClusterTargetAllOf = (AddonClusterTargetAllOf) o;
+    return Objects.equals(this.clusterId, addonClusterTargetAllOf.clusterId);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(clusterId);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AddonClusterTargetAllOf {\n");
+    sb.append("    clusterId: ").append(toIndentedString(clusterId)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+