diff --git a/.openapi/connector_mgmt.yaml b/.openapi/connector_mgmt.yaml index 3b2f5d62..93ff8505 100644 --- a/.openapi/connector_mgmt.yaml +++ b/.openapi/connector_mgmt.yaml @@ -1031,7 +1031,6 @@ components: - page - size - total - - items type: object properties: kind: @@ -1042,10 +1041,6 @@ components: type: integer total: type: integer - items: - type: array - items: - $ref: "#/components/schemas/ObjectReference" Error: type: object @@ -1122,9 +1117,8 @@ components: properties: collections: type: array - items: - allOf: - - $ref: "#/components/schemas/ObjectReference" + items: # removed allOf to workaround this issue: https://github.com/microsoft/kiota/issues/2442 + $ref: "#/components/schemas/ObjectReference" # # Services @@ -1217,6 +1211,7 @@ components: - $ref: "#/components/schemas/ConnectorClusterStatus" ConnectorClusterList: + required: [ items ] allOf: - $ref: "#/components/schemas/List" - type: object @@ -1331,6 +1326,7 @@ components: - $ref: "#/components/schemas/ConnectorStatus" ConnectorList: + required: [ items ] allOf: - $ref: "#/components/schemas/List" - type: object @@ -1396,6 +1392,7 @@ components: type: object ConnectorTypeList: + required: [ items ] allOf: - $ref: "#/components/schemas/List" - type: object @@ -1513,6 +1510,7 @@ components: - $ref: "#/components/schemas/ConnectorNamespaceRequestMeta" ConnectorNamespaceList: + required: [ items ] allOf: - $ref: "#/components/schemas/List" - type: object diff --git a/packages/connector-management-sdk/api/openapi.yaml b/packages/connector-management-sdk/api/openapi.yaml index 7ea8a63b..3f3ec0ec 100644 --- a/packages/connector-management-sdk/api/openapi.yaml +++ b/packages/connector-management-sdk/api/openapi.yaml @@ -2103,12 +2103,7 @@ components: type: integer total: type: integer - items: - items: - $ref: '#/components/schemas/ObjectReference' - type: array required: - - items - kind - page - size @@ -2251,6 +2246,8 @@ components: allOf: - $ref: '#/components/schemas/List' - $ref: '#/components/schemas/ConnectorClusterList_allOf' + required: + - items Channel: default: stable enum: @@ -2336,6 +2333,8 @@ components: allOf: - $ref: '#/components/schemas/List' - $ref: '#/components/schemas/ConnectorList_allOf' + required: + - items ConnectorType: allOf: - $ref: '#/components/schemas/ObjectReference' @@ -2349,6 +2348,8 @@ components: allOf: - $ref: '#/components/schemas/List' - $ref: '#/components/schemas/ConnectorTypeList_allOf' + required: + - items ConnectorTypeLabelCount: description: Represents a connector type label and the number of types with that label @@ -2458,6 +2459,8 @@ components: allOf: - $ref: '#/components/schemas/List' - $ref: '#/components/schemas/ConnectorNamespaceList_allOf' + required: + - items ConnectorNamespaceState: enum: - disconnected @@ -2506,8 +2509,7 @@ components: properties: collections: items: - allOf: - - $ref: '#/components/schemas/ObjectReference' + $ref: '#/components/schemas/ObjectReference' type: array type: object ConnectorClusterStatus_status: diff --git a/packages/connector-management-sdk/docs/ModelList.md b/packages/connector-management-sdk/docs/ModelList.md index e9984fee..99889279 100644 --- a/packages/connector-management-sdk/docs/ModelList.md +++ b/packages/connector-management-sdk/docs/ModelList.md @@ -11,7 +11,6 @@ Name | Type | Description | Notes **page** | **Integer** | | **size** | **Integer** | | **total** | **Integer** | | -**items** | [**List<ObjectReference>**](ObjectReference.md) | | diff --git a/packages/connector-management-sdk/src/main/java/com/openshift/cloud/api/connector/models/ModelList.java b/packages/connector-management-sdk/src/main/java/com/openshift/cloud/api/connector/models/ModelList.java index 1c534db1..00611483 100644 --- a/packages/connector-management-sdk/src/main/java/com/openshift/cloud/api/connector/models/ModelList.java +++ b/packages/connector-management-sdk/src/main/java/com/openshift/cloud/api/connector/models/ModelList.java @@ -20,11 +20,8 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; -import com.openshift.cloud.api.connector.models.ObjectReference; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.ArrayList; -import java.util.List; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -35,8 +32,7 @@ ModelList.JSON_PROPERTY_KIND, ModelList.JSON_PROPERTY_PAGE, ModelList.JSON_PROPERTY_SIZE, - ModelList.JSON_PROPERTY_TOTAL, - ModelList.JSON_PROPERTY_ITEMS + ModelList.JSON_PROPERTY_TOTAL }) @JsonTypeName("List") @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") @@ -53,9 +49,6 @@ public class ModelList { public static final String JSON_PROPERTY_TOTAL = "total"; private Integer total; - public static final String JSON_PROPERTY_ITEMS = "items"; - private List items = new ArrayList<>(); - public ModelList() { } @@ -167,38 +160,6 @@ public void setTotal(Integer total) { } - public ModelList items(List items) { - - this.items = items; - return this; - } - - public ModelList addItemsItem(ObjectReference itemsItem) { - this.items.add(itemsItem); - return this; - } - - /** - * Get items - * @return items - **/ - @javax.annotation.Nonnull - @ApiModelProperty(required = true, value = "") - @JsonProperty(JSON_PROPERTY_ITEMS) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - - public List getItems() { - return items; - } - - - @JsonProperty(JSON_PROPERTY_ITEMS) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setItems(List items) { - this.items = items; - } - - @Override public boolean equals(Object o) { if (this == o) { @@ -211,13 +172,12 @@ public boolean equals(Object o) { return Objects.equals(this.kind, _list.kind) && Objects.equals(this.page, _list.page) && Objects.equals(this.size, _list.size) && - Objects.equals(this.total, _list.total) && - Objects.equals(this.items, _list.items); + Objects.equals(this.total, _list.total); } @Override public int hashCode() { - return Objects.hash(kind, page, size, total, items); + return Objects.hash(kind, page, size, total); } @Override @@ -228,7 +188,6 @@ public String toString() { sb.append(" page: ").append(toIndentedString(page)).append("\n"); sb.append(" size: ").append(toIndentedString(size)).append("\n"); sb.append(" total: ").append(toIndentedString(total)).append("\n"); - sb.append(" items: ").append(toIndentedString(items)).append("\n"); sb.append("}"); return sb.toString(); }