From a75c2efcf890e513c9441ee27faed89bc0ffc6ac Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Wed, 7 Aug 2024 15:16:34 +0200 Subject: [PATCH] refactor: kubernetes-model-gatewayapi generated from OpenAPI schemas Signed-off-by: Marc Nuri --- Makefile | 1 + kubernetes-model-generator/generateModel.sh | 1 - .../kubernetes-model-gatewayapi/Makefile | 27 -- .../cmd/generate/generate.go | 111 ----- .../kubernetes-model-gatewayapi/pom.xml | 38 +- .../kubernetes/api/model/KubeSchema.java | 437 ------------------ .../api/model/ValidationSchema.java | 437 ------------------ .../CookieConfig.java} | 38 +- .../FrontendTLSValidation.java} | 35 +- .../api/model/gatewayapi/v1/Gateway.java | 11 +- .../api/model/gatewayapi/v1/GatewayClass.java | 11 +- .../gatewayapi/v1/GatewayInfrastructure.java | 18 +- .../model/gatewayapi/v1/GatewayTLSConfig.java | 16 +- .../model/gatewayapi/v1/HTTPBackendRef.java | 17 +- .../api/model/gatewayapi/v1/HTTPRoute.java | 11 +- .../model/gatewayapi/v1/HTTPRouteFilter.java | 3 +- .../model/gatewayapi/v1/HTTPRouteRule.java | 16 +- .../LocalParametersReference.java} | 68 +-- .../{BackendRef.java => ObjectReference.java} | 62 +-- .../model/gatewayapi/v1/RouteNamespaces.java | 3 +- .../SessionPersistence.java} | 82 ++-- .../gatewayapi/v1alpha2/BackendTLSPolicy.java | 203 -------- .../v1alpha2/BackendTLSPolicyConfig.java | 139 ------ .../v1alpha2/BackendTLSPolicyList.java | 195 -------- .../v1alpha2/BackendTLSPolicySpec.java | 122 ----- .../gatewayapi/v1alpha2/GRPCBackendRef.java | 211 --------- .../model/gatewayapi/v1alpha2/GRPCRoute.java | 203 -------- .../gatewayapi/v1alpha2/GRPCRouteFilter.java | 165 ------- .../gatewayapi/v1alpha2/GRPCRouteList.java | 195 -------- .../gatewayapi/v1alpha2/GRPCRouteMatch.java | 126 ----- .../gatewayapi/v1alpha2/GRPCRouteRule.java | 144 ------ .../gatewayapi/v1alpha2/GRPCRouteSpec.java | 145 ------ .../model/gatewayapi/v1alpha2/Gateway.java | 205 -------- .../gatewayapi/v1alpha2/GatewayClass.java | 204 -------- .../gatewayapi/v1alpha2/GatewayClassList.java | 195 -------- .../gatewayapi/v1alpha2/GatewayList.java | 195 -------- .../model/gatewayapi/v1alpha2/HTTPRoute.java | 205 -------- .../gatewayapi/v1alpha2/HTTPRouteList.java | 195 -------- .../v1alpha2/PolicyAncestorStatus.java | 142 ------ .../PolicyTargetReferenceWithSectionName.java | 179 ------- .../gatewayapi/v1alpha2/ReferenceGrant.java | 190 -------- .../v1alpha2/ReferenceGrantList.java | 195 -------- .../model/gatewayapi/v1alpha2/TCPRoute.java | 203 -------- .../gatewayapi/v1alpha2/TCPRouteList.java | 195 -------- .../gatewayapi/v1alpha2/TCPRouteRule.java | 113 ----- .../gatewayapi/v1alpha2/TCPRouteSpec.java | 129 ------ .../gatewayapi/v1alpha2/TCPRouteStatus.java | 113 ----- .../model/gatewayapi/v1alpha2/TLSRoute.java | 203 -------- .../gatewayapi/v1alpha2/TLSRouteList.java | 195 -------- .../gatewayapi/v1alpha2/TLSRouteRule.java | 113 ----- .../gatewayapi/v1alpha2/TLSRouteSpec.java | 145 ------ .../gatewayapi/v1alpha2/TLSRouteStatus.java | 113 ----- .../model/gatewayapi/v1alpha2/UDPRoute.java | 203 -------- .../gatewayapi/v1alpha2/UDPRouteList.java | 195 -------- .../gatewayapi/v1alpha2/UDPRouteRule.java | 113 ----- .../gatewayapi/v1alpha2/UDPRouteSpec.java | 129 ------ .../gatewayapi/v1alpha2/UDPRouteStatus.java | 113 ----- .../api/model/gatewayapi/v1beta1/Gateway.java | 11 +- .../gatewayapi/v1beta1/GatewayClass.java | 11 +- .../model/gatewayapi/v1beta1/HTTPRoute.java | 11 +- .../gatewayapi/v1beta1/ReferenceGrant.java | 11 +- .../schema/generator/ImportManager.java | 47 ++ .../generator/model/ModelGenerator.java | 40 +- .../generator/model/TemplateContext.java | 29 +- .../schema/generator/schema/SchemaUtils.java | 46 +- .../schema/generator/SchemaUtilsTest.java | 107 +++-- 66 files changed, 414 insertions(+), 7370 deletions(-) delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/Makefile delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/cmd/generate/generate.go delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java rename kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/{v1alpha2/PolicyStatus.java => v1/CookieConfig.java} (76%) rename kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/{v1alpha2/GRPCRouteStatus.java => v1/FrontendTLSValidation.java} (73%) rename kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/{v1alpha2/GRPCHeaderMatch.java => v1/LocalParametersReference.java} (76%) rename kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/{BackendRef.java => ObjectReference.java} (76%) rename kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/{v1alpha2/GRPCMethodMatch.java => v1/SessionPersistence.java} (61%) delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicy.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicyConfig.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicyList.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicySpec.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCBackendRef.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRoute.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteFilter.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteList.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteMatch.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteRule.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteSpec.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/Gateway.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GatewayClass.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GatewayClassList.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GatewayList.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/HTTPRoute.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/HTTPRouteList.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/PolicyAncestorStatus.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/PolicyTargetReferenceWithSectionName.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/ReferenceGrant.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/ReferenceGrantList.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRoute.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteList.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteRule.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteSpec.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteStatus.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRoute.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteList.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteRule.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteSpec.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteStatus.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRoute.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteList.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteRule.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteSpec.java delete mode 100644 kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteStatus.java create mode 100644 kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/ImportManager.java diff --git a/Makefile b/Makefile index e131e34b8b1..7c7c24e76ff 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,7 @@ generate-openapi-classes: cd kubernetes-model-generator/kubernetes-model-events && mvn -Pgenerate clean install cd kubernetes-model-generator/kubernetes-model-extensions && mvn -Pgenerate clean install cd kubernetes-model-generator/kubernetes-model-flowcontrol && mvn -Pgenerate clean install + cd kubernetes-model-generator/kubernetes-model-gatewayapi && mvn -Pgenerate clean install # Legacy generation of the model: TODO: remove .PHONY: generate-model-legacy diff --git a/kubernetes-model-generator/generateModel.sh b/kubernetes-model-generator/generateModel.sh index 969862f8469..699093e0864 100755 --- a/kubernetes-model-generator/generateModel.sh +++ b/kubernetes-model-generator/generateModel.sh @@ -22,7 +22,6 @@ ABSOLUTE_BASEDIR=$(realpath "$BASEDIR") # Array for all existing modules declare -a modules=( - "kubernetes-model-gatewayapi" "kubernetes-model-networking" "kubernetes-model-metrics" "kubernetes-model-node" diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/Makefile b/kubernetes-model-generator/kubernetes-model-gatewayapi/Makefile deleted file mode 100644 index c09a7003874..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (C) 2015 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -SHELL := /bin/bash - -all: build - -build: gobuild - mvn -Pgenerate clean install -DskipTests - -gobuild: - CGO_ENABLED=0 GO15VENDOREXPERIMENT=1 go build -a ./cmd/generate/generate.go - ./generate > src/main/resources/schema/kube-schema.json - ./generate validation > src/main/resources/schema/validation-schema.json diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-gatewayapi/cmd/generate/generate.go deleted file mode 100644 index 68591991df7..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/cmd/generate/generate.go +++ /dev/null @@ -1,111 +0,0 @@ -/** - * Copyright (C) 2015 Red Hat, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package main - -import ( - "bytes" - "encoding/json" - "fmt" - v1alpha2gwapi "sigs.k8s.io/gateway-api/apis/v1alpha2" - v1beta1gwapi "sigs.k8s.io/gateway-api/apis/v1beta1" - v1gwapi "sigs.k8s.io/gateway-api/apis/v1" - - "log" - "reflect" - "strings" - "time" - - "os" - - "github.com/fabric8io/kubernetes-client/kubernetes-model-generator/pkg/schemagen" -) - -type Schema struct { - Gateway v1alpha2gwapi.Gateway - GatewayList v1alpha2gwapi.GatewayList - GatewayClass v1alpha2gwapi.GatewayClass - GatewayClassList v1alpha2gwapi.GatewayClassList - HTTPRoute v1alpha2gwapi.HTTPRoute - HTTPRouteList v1alpha2gwapi.HTTPRouteList - ReferenceGrant v1alpha2gwapi.ReferenceGrant - ReferenceGrantList v1alpha2gwapi.ReferenceGrantList - TCPRoute v1alpha2gwapi.TCPRoute - TCPRouteList v1alpha2gwapi.TCPRouteList - TLSRoute v1alpha2gwapi.TLSRoute - TLSRouteList v1alpha2gwapi.TLSRouteList - UDPRoute v1alpha2gwapi.UDPRoute - UDPRouteList v1alpha2gwapi.UDPRouteList - GRPCRoute v1alpha2gwapi.GRPCRoute - GRPCRouteList v1alpha2gwapi.GRPCRouteList - BackendTLSPolicy v1alpha2gwapi.BackendTLSPolicy - BackendTLSPolicyList v1alpha2gwapi.BackendTLSPolicyList - V1Beta1Gateway v1beta1gwapi.Gateway - V1Beta1GatewayList v1beta1gwapi.GatewayList - V1Beta1GatewayClass v1beta1gwapi.GatewayClass - V1Beta1GatewayClassList v1beta1gwapi.GatewayClassList - V1Beta1HTTPRoute v1beta1gwapi.HTTPRoute - V1Beta1HTTPRouteList v1beta1gwapi.HTTPRouteList - V1Beta1ReferenceGrant v1beta1gwapi.ReferenceGrant - V1Beta1ReferenceGrantList v1beta1gwapi.ReferenceGrantList - V1Gateway v1gwapi.Gateway - V1GatewayList v1gwapi.GatewayList - V1GatewayClass v1gwapi.GatewayClass - V1GatewayClassList v1gwapi.GatewayClassList - V1HTTPRoute v1gwapi.HTTPRoute - V1HTTPRouteList v1gwapi.HTTPRouteList -} - -func main() { - packages := []schemagen.PackageDescriptor{ - {"k8s.io/apimachinery/pkg/api/resource", "", "io.fabric8.kubernetes.api.model", "kubernetes_resource_", false}, - {"k8s.io/apimachinery/pkg/version", "", "io.fabric8.kubernetes.api.model.version", "kubernetes_apimachinery_pkg_version_", false}, - {"k8s.io/apimachinery/pkg/apis/meta/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_apimachinery_", false}, - {"k8s.io/api/core/v1", "", "io.fabric8.kubernetes.api.model", "kubernetes_core_", false}, - {"sigs.k8s.io/gateway-api/apis/v1alpha2", "gateway.networking.k8s.io", "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2", "kubernetes_sigs_gatewayapi_v1alpha2_", true}, - {"sigs.k8s.io/gateway-api/apis/v1beta1", "gateway.networking.k8s.io", "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1", "kubernetes_sigs_gatewayapi_v1beta1_", true}, - {"sigs.k8s.io/gateway-api/apis/v1", "gateway.networking.k8s.io", "io.fabric8.kubernetes.api.model.gatewayapi.v1", "kubernetes_sigs_gatewayapi_v1_", true}, - } - - typeMap := map[reflect.Type]reflect.Type{ - reflect.TypeOf(time.Time{}): reflect.TypeOf(""), - reflect.TypeOf(struct{}{}): reflect.TypeOf(""), - } - schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, map[reflect.Type]string{}, "gatewayapi") - if err != nil { - fmt.Fprintf(os.Stderr, "An error occurred: %v", err) - return - } - - args := os.Args[1:] - if len(args) < 1 || args[0] != "validation" { - schema.Resources = nil - } - - b, err := json.Marshal(&schema) - if err != nil { - log.Fatal(err) - } - result := string(b) - result = strings.Replace(result, "\"additionalProperty\":", "\"additionalProperties\":", -1) - - var out bytes.Buffer - err = json.Indent(&out, []byte(result), "", " ") - if err != nil { - log.Fatal(err) - } - - fmt.Println(out.String()) -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/pom.xml b/kubernetes-model-generator/kubernetes-model-gatewayapi/pom.xml index d508cf1822f..3e69429ad6a 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/pom.xml @@ -43,10 +43,6 @@ io.fabric8 kubernetes-model-core - - io.fabric8 - kubernetes-model-common - org.assertj assertj-core @@ -54,31 +50,27 @@ - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - false - - - - - - - generate - org.jsonschema2pojo - jsonschema2pojo-maven-plugin + io.fabric8 + openapi-model-generator-maven-plugin + + + + ${project.basedir}/../openapi/schemas/gateway-api.json + + + io.fabric8.kubernetes.api.model.gatewayapi + + + ^io\.k8s\.sigs\.gateway-api\.apis\..*$ + + + diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java deleted file mode 100644 index e9d7303600b..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ /dev/null @@ -1,437 +0,0 @@ - -package io.fabric8.kubernetes.api.model; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.BackendTLSPolicy; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.BackendTLSPolicyList; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GRPCRoute; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GRPCRouteList; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TCPRoute; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TCPRouteList; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TLSRoute; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TLSRouteList; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.UDPRoute; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.UDPRouteList; - -@Generated("jsonschema2pojo") -public class KubeSchema { - - private BackendTLSPolicy backendTLSPolicy; - private BackendTLSPolicyList backendTLSPolicyList; - private GRPCRoute gRPCRoute; - private GRPCRouteList gRPCRouteList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway gateway; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass gatewayClass; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassList gatewayClassList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayList gatewayList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute hTTPRoute; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList hTTPRouteList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant referenceGrant; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList referenceGrantList; - private TCPRoute tCPRoute; - private TCPRouteList tCPRouteList; - private TLSRoute tLSRoute; - private TLSRouteList tLSRouteList; - private UDPRoute uDPRoute; - private UDPRouteList uDPRouteList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway v1Beta1Gateway; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass v1Beta1GatewayClass; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassList v1Beta1GatewayClassList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayList v1Beta1GatewayList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute v1Beta1HTTPRoute; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList v1Beta1HTTPRouteList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant v1Beta1ReferenceGrant; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList v1Beta1ReferenceGrantList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1.Gateway v1Gateway; - private io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass v1GatewayClass; - private io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClassList v1GatewayClassList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayList v1GatewayList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute v1HTTPRoute; - private io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRouteList v1HTTPRouteList; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public KubeSchema() { - } - - public KubeSchema(BackendTLSPolicy backendTLSPolicy, BackendTLSPolicyList backendTLSPolicyList, GRPCRoute gRPCRoute, GRPCRouteList gRPCRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway gateway, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass gatewayClass, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassList gatewayClassList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayList gatewayList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute hTTPRoute, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList hTTPRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant referenceGrant, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList referenceGrantList, TCPRoute tCPRoute, TCPRouteList tCPRouteList, TLSRoute tLSRoute, TLSRouteList tLSRouteList, UDPRoute uDPRoute, UDPRouteList uDPRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway v1Beta1Gateway, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass v1Beta1GatewayClass, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassList v1Beta1GatewayClassList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayList v1Beta1GatewayList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute v1Beta1HTTPRoute, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList v1Beta1HTTPRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant v1Beta1ReferenceGrant, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList v1Beta1ReferenceGrantList, io.fabric8.kubernetes.api.model.gatewayapi.v1.Gateway v1Gateway, io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass v1GatewayClass, io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClassList v1GatewayClassList, io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayList v1GatewayList, io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute v1HTTPRoute, io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRouteList v1HTTPRouteList) { - super(); - this.backendTLSPolicy = backendTLSPolicy; - this.backendTLSPolicyList = backendTLSPolicyList; - this.gRPCRoute = gRPCRoute; - this.gRPCRouteList = gRPCRouteList; - this.gateway = gateway; - this.gatewayClass = gatewayClass; - this.gatewayClassList = gatewayClassList; - this.gatewayList = gatewayList; - this.hTTPRoute = hTTPRoute; - this.hTTPRouteList = hTTPRouteList; - this.referenceGrant = referenceGrant; - this.referenceGrantList = referenceGrantList; - this.tCPRoute = tCPRoute; - this.tCPRouteList = tCPRouteList; - this.tLSRoute = tLSRoute; - this.tLSRouteList = tLSRouteList; - this.uDPRoute = uDPRoute; - this.uDPRouteList = uDPRouteList; - this.v1Beta1Gateway = v1Beta1Gateway; - this.v1Beta1GatewayClass = v1Beta1GatewayClass; - this.v1Beta1GatewayClassList = v1Beta1GatewayClassList; - this.v1Beta1GatewayList = v1Beta1GatewayList; - this.v1Beta1HTTPRoute = v1Beta1HTTPRoute; - this.v1Beta1HTTPRouteList = v1Beta1HTTPRouteList; - this.v1Beta1ReferenceGrant = v1Beta1ReferenceGrant; - this.v1Beta1ReferenceGrantList = v1Beta1ReferenceGrantList; - this.v1Gateway = v1Gateway; - this.v1GatewayClass = v1GatewayClass; - this.v1GatewayClassList = v1GatewayClassList; - this.v1GatewayList = v1GatewayList; - this.v1HTTPRoute = v1HTTPRoute; - this.v1HTTPRouteList = v1HTTPRouteList; - } - - @JsonProperty("BackendTLSPolicy") - public BackendTLSPolicy getBackendTLSPolicy() { - return backendTLSPolicy; - } - - @JsonProperty("BackendTLSPolicy") - public void setBackendTLSPolicy(BackendTLSPolicy backendTLSPolicy) { - this.backendTLSPolicy = backendTLSPolicy; - } - - @JsonProperty("BackendTLSPolicyList") - public BackendTLSPolicyList getBackendTLSPolicyList() { - return backendTLSPolicyList; - } - - @JsonProperty("BackendTLSPolicyList") - public void setBackendTLSPolicyList(BackendTLSPolicyList backendTLSPolicyList) { - this.backendTLSPolicyList = backendTLSPolicyList; - } - - @JsonProperty("GRPCRoute") - public GRPCRoute getGRPCRoute() { - return gRPCRoute; - } - - @JsonProperty("GRPCRoute") - public void setGRPCRoute(GRPCRoute gRPCRoute) { - this.gRPCRoute = gRPCRoute; - } - - @JsonProperty("GRPCRouteList") - public GRPCRouteList getGRPCRouteList() { - return gRPCRouteList; - } - - @JsonProperty("GRPCRouteList") - public void setGRPCRouteList(GRPCRouteList gRPCRouteList) { - this.gRPCRouteList = gRPCRouteList; - } - - @JsonProperty("Gateway") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway getGateway() { - return gateway; - } - - @JsonProperty("Gateway") - public void setGateway(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway gateway) { - this.gateway = gateway; - } - - @JsonProperty("GatewayClass") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass getGatewayClass() { - return gatewayClass; - } - - @JsonProperty("GatewayClass") - public void setGatewayClass(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass gatewayClass) { - this.gatewayClass = gatewayClass; - } - - @JsonProperty("GatewayClassList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassList getGatewayClassList() { - return gatewayClassList; - } - - @JsonProperty("GatewayClassList") - public void setGatewayClassList(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassList gatewayClassList) { - this.gatewayClassList = gatewayClassList; - } - - @JsonProperty("GatewayList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayList getGatewayList() { - return gatewayList; - } - - @JsonProperty("GatewayList") - public void setGatewayList(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayList gatewayList) { - this.gatewayList = gatewayList; - } - - @JsonProperty("HTTPRoute") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute getHTTPRoute() { - return hTTPRoute; - } - - @JsonProperty("HTTPRoute") - public void setHTTPRoute(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute hTTPRoute) { - this.hTTPRoute = hTTPRoute; - } - - @JsonProperty("HTTPRouteList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList getHTTPRouteList() { - return hTTPRouteList; - } - - @JsonProperty("HTTPRouteList") - public void setHTTPRouteList(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList hTTPRouteList) { - this.hTTPRouteList = hTTPRouteList; - } - - @JsonProperty("ReferenceGrant") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant getReferenceGrant() { - return referenceGrant; - } - - @JsonProperty("ReferenceGrant") - public void setReferenceGrant(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant referenceGrant) { - this.referenceGrant = referenceGrant; - } - - @JsonProperty("ReferenceGrantList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList getReferenceGrantList() { - return referenceGrantList; - } - - @JsonProperty("ReferenceGrantList") - public void setReferenceGrantList(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList referenceGrantList) { - this.referenceGrantList = referenceGrantList; - } - - @JsonProperty("TCPRoute") - public TCPRoute getTCPRoute() { - return tCPRoute; - } - - @JsonProperty("TCPRoute") - public void setTCPRoute(TCPRoute tCPRoute) { - this.tCPRoute = tCPRoute; - } - - @JsonProperty("TCPRouteList") - public TCPRouteList getTCPRouteList() { - return tCPRouteList; - } - - @JsonProperty("TCPRouteList") - public void setTCPRouteList(TCPRouteList tCPRouteList) { - this.tCPRouteList = tCPRouteList; - } - - @JsonProperty("TLSRoute") - public TLSRoute getTLSRoute() { - return tLSRoute; - } - - @JsonProperty("TLSRoute") - public void setTLSRoute(TLSRoute tLSRoute) { - this.tLSRoute = tLSRoute; - } - - @JsonProperty("TLSRouteList") - public TLSRouteList getTLSRouteList() { - return tLSRouteList; - } - - @JsonProperty("TLSRouteList") - public void setTLSRouteList(TLSRouteList tLSRouteList) { - this.tLSRouteList = tLSRouteList; - } - - @JsonProperty("UDPRoute") - public UDPRoute getUDPRoute() { - return uDPRoute; - } - - @JsonProperty("UDPRoute") - public void setUDPRoute(UDPRoute uDPRoute) { - this.uDPRoute = uDPRoute; - } - - @JsonProperty("UDPRouteList") - public UDPRouteList getUDPRouteList() { - return uDPRouteList; - } - - @JsonProperty("UDPRouteList") - public void setUDPRouteList(UDPRouteList uDPRouteList) { - this.uDPRouteList = uDPRouteList; - } - - @JsonProperty("V1Beta1Gateway") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway getV1Beta1Gateway() { - return v1Beta1Gateway; - } - - @JsonProperty("V1Beta1Gateway") - public void setV1Beta1Gateway(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway v1Beta1Gateway) { - this.v1Beta1Gateway = v1Beta1Gateway; - } - - @JsonProperty("V1Beta1GatewayClass") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass getV1Beta1GatewayClass() { - return v1Beta1GatewayClass; - } - - @JsonProperty("V1Beta1GatewayClass") - public void setV1Beta1GatewayClass(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass v1Beta1GatewayClass) { - this.v1Beta1GatewayClass = v1Beta1GatewayClass; - } - - @JsonProperty("V1Beta1GatewayClassList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassList getV1Beta1GatewayClassList() { - return v1Beta1GatewayClassList; - } - - @JsonProperty("V1Beta1GatewayClassList") - public void setV1Beta1GatewayClassList(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassList v1Beta1GatewayClassList) { - this.v1Beta1GatewayClassList = v1Beta1GatewayClassList; - } - - @JsonProperty("V1Beta1GatewayList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayList getV1Beta1GatewayList() { - return v1Beta1GatewayList; - } - - @JsonProperty("V1Beta1GatewayList") - public void setV1Beta1GatewayList(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayList v1Beta1GatewayList) { - this.v1Beta1GatewayList = v1Beta1GatewayList; - } - - @JsonProperty("V1Beta1HTTPRoute") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute getV1Beta1HTTPRoute() { - return v1Beta1HTTPRoute; - } - - @JsonProperty("V1Beta1HTTPRoute") - public void setV1Beta1HTTPRoute(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute v1Beta1HTTPRoute) { - this.v1Beta1HTTPRoute = v1Beta1HTTPRoute; - } - - @JsonProperty("V1Beta1HTTPRouteList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList getV1Beta1HTTPRouteList() { - return v1Beta1HTTPRouteList; - } - - @JsonProperty("V1Beta1HTTPRouteList") - public void setV1Beta1HTTPRouteList(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList v1Beta1HTTPRouteList) { - this.v1Beta1HTTPRouteList = v1Beta1HTTPRouteList; - } - - @JsonProperty("V1Beta1ReferenceGrant") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant getV1Beta1ReferenceGrant() { - return v1Beta1ReferenceGrant; - } - - @JsonProperty("V1Beta1ReferenceGrant") - public void setV1Beta1ReferenceGrant(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant v1Beta1ReferenceGrant) { - this.v1Beta1ReferenceGrant = v1Beta1ReferenceGrant; - } - - @JsonProperty("V1Beta1ReferenceGrantList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList getV1Beta1ReferenceGrantList() { - return v1Beta1ReferenceGrantList; - } - - @JsonProperty("V1Beta1ReferenceGrantList") - public void setV1Beta1ReferenceGrantList(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList v1Beta1ReferenceGrantList) { - this.v1Beta1ReferenceGrantList = v1Beta1ReferenceGrantList; - } - - @JsonProperty("V1Gateway") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.Gateway getV1Gateway() { - return v1Gateway; - } - - @JsonProperty("V1Gateway") - public void setV1Gateway(io.fabric8.kubernetes.api.model.gatewayapi.v1.Gateway v1Gateway) { - this.v1Gateway = v1Gateway; - } - - @JsonProperty("V1GatewayClass") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass getV1GatewayClass() { - return v1GatewayClass; - } - - @JsonProperty("V1GatewayClass") - public void setV1GatewayClass(io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass v1GatewayClass) { - this.v1GatewayClass = v1GatewayClass; - } - - @JsonProperty("V1GatewayClassList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClassList getV1GatewayClassList() { - return v1GatewayClassList; - } - - @JsonProperty("V1GatewayClassList") - public void setV1GatewayClassList(io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClassList v1GatewayClassList) { - this.v1GatewayClassList = v1GatewayClassList; - } - - @JsonProperty("V1GatewayList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayList getV1GatewayList() { - return v1GatewayList; - } - - @JsonProperty("V1GatewayList") - public void setV1GatewayList(io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayList v1GatewayList) { - this.v1GatewayList = v1GatewayList; - } - - @JsonProperty("V1HTTPRoute") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute getV1HTTPRoute() { - return v1HTTPRoute; - } - - @JsonProperty("V1HTTPRoute") - public void setV1HTTPRoute(io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute v1HTTPRoute) { - this.v1HTTPRoute = v1HTTPRoute; - } - - @JsonProperty("V1HTTPRouteList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRouteList getV1HTTPRouteList() { - return v1HTTPRouteList; - } - - @JsonProperty("V1HTTPRouteList") - public void setV1HTTPRouteList(io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRouteList v1HTTPRouteList) { - this.v1HTTPRouteList = v1HTTPRouteList; - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java deleted file mode 100644 index 175e9c4b2d3..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ /dev/null @@ -1,437 +0,0 @@ - -package io.fabric8.kubernetes.api.model; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.BackendTLSPolicy; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.BackendTLSPolicyList; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GRPCRoute; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GRPCRouteList; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TCPRoute; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TCPRouteList; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TLSRoute; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TLSRouteList; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.UDPRoute; -import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.UDPRouteList; - -@Generated("jsonschema2pojo") -public class ValidationSchema { - - private BackendTLSPolicy backendTLSPolicy; - private BackendTLSPolicyList backendTLSPolicyList; - private GRPCRoute gRPCRoute; - private GRPCRouteList gRPCRouteList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway gateway; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass gatewayClass; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassList gatewayClassList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayList gatewayList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute hTTPRoute; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList hTTPRouteList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant referenceGrant; - private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList referenceGrantList; - private TCPRoute tCPRoute; - private TCPRouteList tCPRouteList; - private TLSRoute tLSRoute; - private TLSRouteList tLSRouteList; - private UDPRoute uDPRoute; - private UDPRouteList uDPRouteList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway v1Beta1Gateway; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass v1Beta1GatewayClass; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassList v1Beta1GatewayClassList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayList v1Beta1GatewayList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute v1Beta1HTTPRoute; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList v1Beta1HTTPRouteList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant v1Beta1ReferenceGrant; - private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList v1Beta1ReferenceGrantList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1.Gateway v1Gateway; - private io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass v1GatewayClass; - private io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClassList v1GatewayClassList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayList v1GatewayList; - private io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute v1HTTPRoute; - private io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRouteList v1HTTPRouteList; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ValidationSchema() { - } - - public ValidationSchema(BackendTLSPolicy backendTLSPolicy, BackendTLSPolicyList backendTLSPolicyList, GRPCRoute gRPCRoute, GRPCRouteList gRPCRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway gateway, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass gatewayClass, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassList gatewayClassList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayList gatewayList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute hTTPRoute, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList hTTPRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant referenceGrant, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList referenceGrantList, TCPRoute tCPRoute, TCPRouteList tCPRouteList, TLSRoute tLSRoute, TLSRouteList tLSRouteList, UDPRoute uDPRoute, UDPRouteList uDPRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway v1Beta1Gateway, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass v1Beta1GatewayClass, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassList v1Beta1GatewayClassList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayList v1Beta1GatewayList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute v1Beta1HTTPRoute, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList v1Beta1HTTPRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant v1Beta1ReferenceGrant, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList v1Beta1ReferenceGrantList, io.fabric8.kubernetes.api.model.gatewayapi.v1.Gateway v1Gateway, io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass v1GatewayClass, io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClassList v1GatewayClassList, io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayList v1GatewayList, io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute v1HTTPRoute, io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRouteList v1HTTPRouteList) { - super(); - this.backendTLSPolicy = backendTLSPolicy; - this.backendTLSPolicyList = backendTLSPolicyList; - this.gRPCRoute = gRPCRoute; - this.gRPCRouteList = gRPCRouteList; - this.gateway = gateway; - this.gatewayClass = gatewayClass; - this.gatewayClassList = gatewayClassList; - this.gatewayList = gatewayList; - this.hTTPRoute = hTTPRoute; - this.hTTPRouteList = hTTPRouteList; - this.referenceGrant = referenceGrant; - this.referenceGrantList = referenceGrantList; - this.tCPRoute = tCPRoute; - this.tCPRouteList = tCPRouteList; - this.tLSRoute = tLSRoute; - this.tLSRouteList = tLSRouteList; - this.uDPRoute = uDPRoute; - this.uDPRouteList = uDPRouteList; - this.v1Beta1Gateway = v1Beta1Gateway; - this.v1Beta1GatewayClass = v1Beta1GatewayClass; - this.v1Beta1GatewayClassList = v1Beta1GatewayClassList; - this.v1Beta1GatewayList = v1Beta1GatewayList; - this.v1Beta1HTTPRoute = v1Beta1HTTPRoute; - this.v1Beta1HTTPRouteList = v1Beta1HTTPRouteList; - this.v1Beta1ReferenceGrant = v1Beta1ReferenceGrant; - this.v1Beta1ReferenceGrantList = v1Beta1ReferenceGrantList; - this.v1Gateway = v1Gateway; - this.v1GatewayClass = v1GatewayClass; - this.v1GatewayClassList = v1GatewayClassList; - this.v1GatewayList = v1GatewayList; - this.v1HTTPRoute = v1HTTPRoute; - this.v1HTTPRouteList = v1HTTPRouteList; - } - - @JsonProperty("BackendTLSPolicy") - public BackendTLSPolicy getBackendTLSPolicy() { - return backendTLSPolicy; - } - - @JsonProperty("BackendTLSPolicy") - public void setBackendTLSPolicy(BackendTLSPolicy backendTLSPolicy) { - this.backendTLSPolicy = backendTLSPolicy; - } - - @JsonProperty("BackendTLSPolicyList") - public BackendTLSPolicyList getBackendTLSPolicyList() { - return backendTLSPolicyList; - } - - @JsonProperty("BackendTLSPolicyList") - public void setBackendTLSPolicyList(BackendTLSPolicyList backendTLSPolicyList) { - this.backendTLSPolicyList = backendTLSPolicyList; - } - - @JsonProperty("GRPCRoute") - public GRPCRoute getGRPCRoute() { - return gRPCRoute; - } - - @JsonProperty("GRPCRoute") - public void setGRPCRoute(GRPCRoute gRPCRoute) { - this.gRPCRoute = gRPCRoute; - } - - @JsonProperty("GRPCRouteList") - public GRPCRouteList getGRPCRouteList() { - return gRPCRouteList; - } - - @JsonProperty("GRPCRouteList") - public void setGRPCRouteList(GRPCRouteList gRPCRouteList) { - this.gRPCRouteList = gRPCRouteList; - } - - @JsonProperty("Gateway") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway getGateway() { - return gateway; - } - - @JsonProperty("Gateway") - public void setGateway(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway gateway) { - this.gateway = gateway; - } - - @JsonProperty("GatewayClass") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass getGatewayClass() { - return gatewayClass; - } - - @JsonProperty("GatewayClass") - public void setGatewayClass(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass gatewayClass) { - this.gatewayClass = gatewayClass; - } - - @JsonProperty("GatewayClassList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassList getGatewayClassList() { - return gatewayClassList; - } - - @JsonProperty("GatewayClassList") - public void setGatewayClassList(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassList gatewayClassList) { - this.gatewayClassList = gatewayClassList; - } - - @JsonProperty("GatewayList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayList getGatewayList() { - return gatewayList; - } - - @JsonProperty("GatewayList") - public void setGatewayList(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayList gatewayList) { - this.gatewayList = gatewayList; - } - - @JsonProperty("HTTPRoute") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute getHTTPRoute() { - return hTTPRoute; - } - - @JsonProperty("HTTPRoute") - public void setHTTPRoute(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute hTTPRoute) { - this.hTTPRoute = hTTPRoute; - } - - @JsonProperty("HTTPRouteList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList getHTTPRouteList() { - return hTTPRouteList; - } - - @JsonProperty("HTTPRouteList") - public void setHTTPRouteList(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList hTTPRouteList) { - this.hTTPRouteList = hTTPRouteList; - } - - @JsonProperty("ReferenceGrant") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant getReferenceGrant() { - return referenceGrant; - } - - @JsonProperty("ReferenceGrant") - public void setReferenceGrant(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant referenceGrant) { - this.referenceGrant = referenceGrant; - } - - @JsonProperty("ReferenceGrantList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList getReferenceGrantList() { - return referenceGrantList; - } - - @JsonProperty("ReferenceGrantList") - public void setReferenceGrantList(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList referenceGrantList) { - this.referenceGrantList = referenceGrantList; - } - - @JsonProperty("TCPRoute") - public TCPRoute getTCPRoute() { - return tCPRoute; - } - - @JsonProperty("TCPRoute") - public void setTCPRoute(TCPRoute tCPRoute) { - this.tCPRoute = tCPRoute; - } - - @JsonProperty("TCPRouteList") - public TCPRouteList getTCPRouteList() { - return tCPRouteList; - } - - @JsonProperty("TCPRouteList") - public void setTCPRouteList(TCPRouteList tCPRouteList) { - this.tCPRouteList = tCPRouteList; - } - - @JsonProperty("TLSRoute") - public TLSRoute getTLSRoute() { - return tLSRoute; - } - - @JsonProperty("TLSRoute") - public void setTLSRoute(TLSRoute tLSRoute) { - this.tLSRoute = tLSRoute; - } - - @JsonProperty("TLSRouteList") - public TLSRouteList getTLSRouteList() { - return tLSRouteList; - } - - @JsonProperty("TLSRouteList") - public void setTLSRouteList(TLSRouteList tLSRouteList) { - this.tLSRouteList = tLSRouteList; - } - - @JsonProperty("UDPRoute") - public UDPRoute getUDPRoute() { - return uDPRoute; - } - - @JsonProperty("UDPRoute") - public void setUDPRoute(UDPRoute uDPRoute) { - this.uDPRoute = uDPRoute; - } - - @JsonProperty("UDPRouteList") - public UDPRouteList getUDPRouteList() { - return uDPRouteList; - } - - @JsonProperty("UDPRouteList") - public void setUDPRouteList(UDPRouteList uDPRouteList) { - this.uDPRouteList = uDPRouteList; - } - - @JsonProperty("V1Beta1Gateway") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway getV1Beta1Gateway() { - return v1Beta1Gateway; - } - - @JsonProperty("V1Beta1Gateway") - public void setV1Beta1Gateway(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway v1Beta1Gateway) { - this.v1Beta1Gateway = v1Beta1Gateway; - } - - @JsonProperty("V1Beta1GatewayClass") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass getV1Beta1GatewayClass() { - return v1Beta1GatewayClass; - } - - @JsonProperty("V1Beta1GatewayClass") - public void setV1Beta1GatewayClass(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass v1Beta1GatewayClass) { - this.v1Beta1GatewayClass = v1Beta1GatewayClass; - } - - @JsonProperty("V1Beta1GatewayClassList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassList getV1Beta1GatewayClassList() { - return v1Beta1GatewayClassList; - } - - @JsonProperty("V1Beta1GatewayClassList") - public void setV1Beta1GatewayClassList(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassList v1Beta1GatewayClassList) { - this.v1Beta1GatewayClassList = v1Beta1GatewayClassList; - } - - @JsonProperty("V1Beta1GatewayList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayList getV1Beta1GatewayList() { - return v1Beta1GatewayList; - } - - @JsonProperty("V1Beta1GatewayList") - public void setV1Beta1GatewayList(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayList v1Beta1GatewayList) { - this.v1Beta1GatewayList = v1Beta1GatewayList; - } - - @JsonProperty("V1Beta1HTTPRoute") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute getV1Beta1HTTPRoute() { - return v1Beta1HTTPRoute; - } - - @JsonProperty("V1Beta1HTTPRoute") - public void setV1Beta1HTTPRoute(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute v1Beta1HTTPRoute) { - this.v1Beta1HTTPRoute = v1Beta1HTTPRoute; - } - - @JsonProperty("V1Beta1HTTPRouteList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList getV1Beta1HTTPRouteList() { - return v1Beta1HTTPRouteList; - } - - @JsonProperty("V1Beta1HTTPRouteList") - public void setV1Beta1HTTPRouteList(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList v1Beta1HTTPRouteList) { - this.v1Beta1HTTPRouteList = v1Beta1HTTPRouteList; - } - - @JsonProperty("V1Beta1ReferenceGrant") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant getV1Beta1ReferenceGrant() { - return v1Beta1ReferenceGrant; - } - - @JsonProperty("V1Beta1ReferenceGrant") - public void setV1Beta1ReferenceGrant(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant v1Beta1ReferenceGrant) { - this.v1Beta1ReferenceGrant = v1Beta1ReferenceGrant; - } - - @JsonProperty("V1Beta1ReferenceGrantList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList getV1Beta1ReferenceGrantList() { - return v1Beta1ReferenceGrantList; - } - - @JsonProperty("V1Beta1ReferenceGrantList") - public void setV1Beta1ReferenceGrantList(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList v1Beta1ReferenceGrantList) { - this.v1Beta1ReferenceGrantList = v1Beta1ReferenceGrantList; - } - - @JsonProperty("V1Gateway") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.Gateway getV1Gateway() { - return v1Gateway; - } - - @JsonProperty("V1Gateway") - public void setV1Gateway(io.fabric8.kubernetes.api.model.gatewayapi.v1.Gateway v1Gateway) { - this.v1Gateway = v1Gateway; - } - - @JsonProperty("V1GatewayClass") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass getV1GatewayClass() { - return v1GatewayClass; - } - - @JsonProperty("V1GatewayClass") - public void setV1GatewayClass(io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass v1GatewayClass) { - this.v1GatewayClass = v1GatewayClass; - } - - @JsonProperty("V1GatewayClassList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClassList getV1GatewayClassList() { - return v1GatewayClassList; - } - - @JsonProperty("V1GatewayClassList") - public void setV1GatewayClassList(io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClassList v1GatewayClassList) { - this.v1GatewayClassList = v1GatewayClassList; - } - - @JsonProperty("V1GatewayList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayList getV1GatewayList() { - return v1GatewayList; - } - - @JsonProperty("V1GatewayList") - public void setV1GatewayList(io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayList v1GatewayList) { - this.v1GatewayList = v1GatewayList; - } - - @JsonProperty("V1HTTPRoute") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute getV1HTTPRoute() { - return v1HTTPRoute; - } - - @JsonProperty("V1HTTPRoute") - public void setV1HTTPRoute(io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute v1HTTPRoute) { - this.v1HTTPRoute = v1HTTPRoute; - } - - @JsonProperty("V1HTTPRouteList") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRouteList getV1HTTPRouteList() { - return v1HTTPRouteList; - } - - @JsonProperty("V1HTTPRouteList") - public void setV1HTTPRouteList(io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRouteList v1HTTPRouteList) { - this.v1HTTPRouteList = v1HTTPRouteList; - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/PolicyStatus.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/CookieConfig.java similarity index 76% rename from kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/PolicyStatus.java rename to kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/CookieConfig.java index b4507090f59..5c43faec710 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/PolicyStatus.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/CookieConfig.java @@ -1,9 +1,7 @@ -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; +package io.fabric8.kubernetes.api.model.gatewayapi.v1; -import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -33,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "ancestors" + "lifetimeType" }) @ToString @EqualsAndHashCode @@ -53,12 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class PolicyStatus implements Editable , KubernetesResource +public class CookieConfig implements Editable , KubernetesResource { - @JsonProperty("ancestors") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List ancestors = new ArrayList<>(); + @JsonProperty("lifetimeType") + private String lifetimeType; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,32 +63,31 @@ public class PolicyStatus implements Editable , KubernetesR * No args constructor for use in serialization * */ - public PolicyStatus() { + public CookieConfig() { } - public PolicyStatus(List ancestors) { + public CookieConfig(String lifetimeType) { super(); - this.ancestors = ancestors; + this.lifetimeType = lifetimeType; } - @JsonProperty("ancestors") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getAncestors() { - return ancestors; + @JsonProperty("lifetimeType") + public String getLifetimeType() { + return lifetimeType; } - @JsonProperty("ancestors") - public void setAncestors(List ancestors) { - this.ancestors = ancestors; + @JsonProperty("lifetimeType") + public void setLifetimeType(String lifetimeType) { + this.lifetimeType = lifetimeType; } @JsonIgnore - public PolicyStatusBuilder edit() { - return new PolicyStatusBuilder(this); + public CookieConfigBuilder edit() { + return new CookieConfigBuilder(this); } @JsonIgnore - public PolicyStatusBuilder toBuilder() { + public CookieConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteStatus.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/FrontendTLSValidation.java similarity index 73% rename from kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteStatus.java rename to kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/FrontendTLSValidation.java index c3cec906c4c..bb5536af631 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteStatus.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/FrontendTLSValidation.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; +package io.fabric8.kubernetes.api.model.gatewayapi.v1; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -24,7 +24,6 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.RouteParentStatus; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -34,7 +33,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "parents" + "caCertificateRefs" }) @ToString @EqualsAndHashCode @@ -54,12 +53,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class GRPCRouteStatus implements Editable , KubernetesResource +public class FrontendTLSValidation implements Editable , KubernetesResource { - @JsonProperty("parents") + @JsonProperty("caCertificateRefs") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List parents = new ArrayList<>(); + private List caCertificateRefs = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -67,32 +66,32 @@ public class GRPCRouteStatus implements Editable , Kuber * No args constructor for use in serialization * */ - public GRPCRouteStatus() { + public FrontendTLSValidation() { } - public GRPCRouteStatus(List parents) { + public FrontendTLSValidation(List caCertificateRefs) { super(); - this.parents = parents; + this.caCertificateRefs = caCertificateRefs; } - @JsonProperty("parents") + @JsonProperty("caCertificateRefs") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getParents() { - return parents; + public List getCaCertificateRefs() { + return caCertificateRefs; } - @JsonProperty("parents") - public void setParents(List parents) { - this.parents = parents; + @JsonProperty("caCertificateRefs") + public void setCaCertificateRefs(List caCertificateRefs) { + this.caCertificateRefs = caCertificateRefs; } @JsonIgnore - public GRPCRouteStatusBuilder edit() { - return new GRPCRouteStatusBuilder(this); + public FrontendTLSValidationBuilder edit() { + return new FrontendTLSValidationBuilder(this); } @JsonIgnore - public GRPCRouteStatusBuilder toBuilder() { + public FrontendTLSValidationBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/Gateway.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/Gateway.java index 1954ea8a9ec..6ba58ac021b 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/Gateway.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/Gateway.java @@ -18,6 +18,7 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class Gateway implements Editable , HasMetadata, Namespac @JsonProperty("kind") private String kind = "Gateway"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private GatewaySpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class Gateway implements Editable , HasMetadata, Namespac public Gateway() { } - public Gateway(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, GatewaySpec spec, GatewayStatus status) { + public Gateway(String apiVersion, String kind, ObjectMeta metadata, GatewaySpec spec, GatewayStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayClass.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayClass.java index 2cfc1664c84..0b2e5492b8c 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayClass.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayClass.java @@ -17,6 +17,7 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -81,7 +82,7 @@ public class GatewayClass implements Editable , HasMetadata @JsonProperty("kind") private String kind = "GatewayClass"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private GatewayClassSpec spec; @JsonProperty("status") @@ -96,7 +97,7 @@ public class GatewayClass implements Editable , HasMetadata public GatewayClass() { } - public GatewayClass(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, GatewayClassSpec spec, GatewayClassStatus status) { + public GatewayClass(String apiVersion, String kind, ObjectMeta metadata, GatewayClassSpec spec, GatewayClassStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -146,12 +147,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayInfrastructure.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayInfrastructure.java index b2b7e5c0bf3..ec93db53a35 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayInfrastructure.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayInfrastructure.java @@ -32,7 +32,8 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "annotations", - "labels" + "labels", + "parametersRef" }) @ToString @EqualsAndHashCode @@ -61,6 +62,8 @@ public class GatewayInfrastructure implements Editable labels = new LinkedHashMap<>(); + @JsonProperty("parametersRef") + private LocalParametersReference parametersRef; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -71,10 +74,11 @@ public class GatewayInfrastructure implements Editable annotations, Map labels) { + public GatewayInfrastructure(Map annotations, Map labels, LocalParametersReference parametersRef) { super(); this.annotations = annotations; this.labels = labels; + this.parametersRef = parametersRef; } @JsonProperty("annotations") @@ -99,6 +103,16 @@ public void setLabels(Map labels) { this.labels = labels; } + @JsonProperty("parametersRef") + public LocalParametersReference getParametersRef() { + return parametersRef; + } + + @JsonProperty("parametersRef") + public void setParametersRef(LocalParametersReference parametersRef) { + this.parametersRef = parametersRef; + } + @JsonIgnore public GatewayInfrastructureBuilder edit() { return new GatewayInfrastructureBuilder(this); diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayTLSConfig.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayTLSConfig.java index 05581543509..3e3ee9c0200 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayTLSConfig.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayTLSConfig.java @@ -34,6 +34,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "certificateRefs", + "frontendValidation", "mode", "options" }) @@ -61,6 +62,8 @@ public class GatewayTLSConfig implements Editable , Kub @JsonProperty("certificateRefs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List certificateRefs = new ArrayList<>(); + @JsonProperty("frontendValidation") + private FrontendTLSValidation frontendValidation; @JsonProperty("mode") private String mode; @JsonProperty("options") @@ -76,9 +79,10 @@ public class GatewayTLSConfig implements Editable , Kub public GatewayTLSConfig() { } - public GatewayTLSConfig(List certificateRefs, String mode, Map options) { + public GatewayTLSConfig(List certificateRefs, FrontendTLSValidation frontendValidation, String mode, Map options) { super(); this.certificateRefs = certificateRefs; + this.frontendValidation = frontendValidation; this.mode = mode; this.options = options; } @@ -94,6 +98,16 @@ public void setCertificateRefs(List certificateRefs) { this.certificateRefs = certificateRefs; } + @JsonProperty("frontendValidation") + public FrontendTLSValidation getFrontendValidation() { + return frontendValidation; + } + + @JsonProperty("frontendValidation") + public void setFrontendValidation(FrontendTLSValidation frontendValidation) { + this.frontendValidation = frontendValidation; + } + @JsonProperty("mode") public String getMode() { return mode; diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPBackendRef.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPBackendRef.java index 15f2856b51e..34f8da743ef 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPBackendRef.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPBackendRef.java @@ -67,13 +67,8 @@ public class HTTPBackendRef implements Editable , Kuberne private List filters = new ArrayList<>(); @JsonProperty("group") private String group; - /** - * - * (Required) - * - */ @JsonProperty("kind") - private String kind = "HTTPBackendRef"; + private String kind; @JsonProperty("name") private String name; @JsonProperty("namespace") @@ -124,21 +119,11 @@ public void setGroup(String group) { this.group = group; } - /** - * - * (Required) - * - */ @JsonProperty("kind") public String getKind() { return kind; } - /** - * - * (Required) - * - */ @JsonProperty("kind") public void setKind(String kind) { this.kind = kind; diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPRoute.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPRoute.java index ba8e59be07e..fb86a489afd 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPRoute.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPRoute.java @@ -18,6 +18,7 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -48,7 +49,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -82,7 +83,7 @@ public class HTTPRoute implements Editable , HasMetadata, Name @JsonProperty("kind") private String kind = "HTTPRoute"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private HTTPRouteSpec spec; @JsonProperty("status") @@ -97,7 +98,7 @@ public class HTTPRoute implements Editable , HasMetadata, Name public HTTPRoute() { } - public HTTPRoute(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, HTTPRouteSpec spec, HTTPRouteStatus status) { + public HTTPRoute(String apiVersion, String kind, ObjectMeta metadata, HTTPRouteSpec spec, HTTPRouteStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -147,12 +148,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPRouteFilter.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPRouteFilter.java index b67abdefb3a..bf72ed532db 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPRouteFilter.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPRouteFilter.java @@ -16,6 +16,7 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; import io.fabric8.kubernetes.api.model.LabelSelector; +import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; @@ -52,7 +53,7 @@ @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), @BuildableReference(ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), + @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPRouteRule.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPRouteRule.java index eb431233c5f..dccdacf72a0 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPRouteRule.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/HTTPRouteRule.java @@ -36,6 +36,7 @@ "backendRefs", "filters", "matches", + "sessionPersistence", "timeouts" }) @ToString @@ -68,6 +69,8 @@ public class HTTPRouteRule implements Editable , Kubernete @JsonProperty("matches") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List matches = new ArrayList<>(); + @JsonProperty("sessionPersistence") + private SessionPersistence sessionPersistence; @JsonProperty("timeouts") private HTTPRouteTimeouts timeouts; @JsonIgnore @@ -80,11 +83,12 @@ public class HTTPRouteRule implements Editable , Kubernete public HTTPRouteRule() { } - public HTTPRouteRule(List backendRefs, List filters, List matches, HTTPRouteTimeouts timeouts) { + public HTTPRouteRule(List backendRefs, List filters, List matches, SessionPersistence sessionPersistence, HTTPRouteTimeouts timeouts) { super(); this.backendRefs = backendRefs; this.filters = filters; this.matches = matches; + this.sessionPersistence = sessionPersistence; this.timeouts = timeouts; } @@ -121,6 +125,16 @@ public void setMatches(List matches) { this.matches = matches; } + @JsonProperty("sessionPersistence") + public SessionPersistence getSessionPersistence() { + return sessionPersistence; + } + + @JsonProperty("sessionPersistence") + public void setSessionPersistence(SessionPersistence sessionPersistence) { + this.sessionPersistence = sessionPersistence; + } + @JsonProperty("timeouts") public HTTPRouteTimeouts getTimeouts() { return timeouts; diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCHeaderMatch.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/LocalParametersReference.java similarity index 76% rename from kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCHeaderMatch.java rename to kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/LocalParametersReference.java index 2da73875217..75dd071acfe 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCHeaderMatch.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/LocalParametersReference.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; +package io.fabric8.kubernetes.api.model.gatewayapi.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,9 +31,9 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name", - "type", - "value" + "kind", + "group", + "name" }) @ToString @EqualsAndHashCode @@ -53,15 +53,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class GRPCHeaderMatch implements Editable , KubernetesResource +public class LocalParametersReference implements Editable , KubernetesResource { + @JsonProperty("group") + private String group; + @JsonProperty("kind") + private String kind; @JsonProperty("name") private String name; - @JsonProperty("type") - private String type; - @JsonProperty("value") - private String value; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,53 +69,53 @@ public class GRPCHeaderMatch implements Editable , Kuber * No args constructor for use in serialization * */ - public GRPCHeaderMatch() { + public LocalParametersReference() { } - public GRPCHeaderMatch(String name, String type, String value) { + public LocalParametersReference(String group, String kind, String name) { super(); + this.group = group; + this.kind = kind; this.name = name; - this.type = type; - this.value = value; } - @JsonProperty("name") - public String getName() { - return name; + @JsonProperty("group") + public String getGroup() { + return group; } - @JsonProperty("name") - public void setName(String name) { - this.name = name; + @JsonProperty("group") + public void setGroup(String group) { + this.group = group; } - @JsonProperty("type") - public String getType() { - return type; + @JsonProperty("kind") + public String getKind() { + return kind; } - @JsonProperty("type") - public void setType(String type) { - this.type = type; + @JsonProperty("kind") + public void setKind(String kind) { + this.kind = kind; } - @JsonProperty("value") - public String getValue() { - return value; + @JsonProperty("name") + public String getName() { + return name; } - @JsonProperty("value") - public void setValue(String value) { - this.value = value; + @JsonProperty("name") + public void setName(String name) { + this.name = name; } @JsonIgnore - public GRPCHeaderMatchBuilder edit() { - return new GRPCHeaderMatchBuilder(this); + public LocalParametersReferenceBuilder edit() { + return new LocalParametersReferenceBuilder(this); } @JsonIgnore - public GRPCHeaderMatchBuilder toBuilder() { + public LocalParametersReferenceBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/BackendRef.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/ObjectReference.java similarity index 76% rename from kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/BackendRef.java rename to kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/ObjectReference.java index 4758b647603..8fb7bc12069 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/BackendRef.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/ObjectReference.java @@ -18,7 +18,6 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; @@ -34,9 +33,7 @@ "kind", "group", "name", - "namespace", - "port", - "weight" + "namespace" }) @ToString @EqualsAndHashCode @@ -51,31 +48,22 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), + @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class BackendRef implements Editable , KubernetesResource +public class ObjectReference implements Editable , KubernetesResource { @JsonProperty("group") private String group; - /** - * - * (Required) - * - */ @JsonProperty("kind") - private String kind = "BackendRef"; + private String kind; @JsonProperty("name") private String name; @JsonProperty("namespace") private String namespace; - @JsonProperty("port") - private Integer port; - @JsonProperty("weight") - private Integer weight; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -83,17 +71,15 @@ public class BackendRef implements Editable , KubernetesResou * No args constructor for use in serialization * */ - public BackendRef() { + public ObjectReference() { } - public BackendRef(String group, String kind, String name, String namespace, Integer port, Integer weight) { + public ObjectReference(String group, String kind, String name, String namespace) { super(); this.group = group; this.kind = kind; this.name = name; this.namespace = namespace; - this.port = port; - this.weight = weight; } @JsonProperty("group") @@ -106,21 +92,11 @@ public void setGroup(String group) { this.group = group; } - /** - * - * (Required) - * - */ @JsonProperty("kind") public String getKind() { return kind; } - /** - * - * (Required) - * - */ @JsonProperty("kind") public void setKind(String kind) { this.kind = kind; @@ -146,33 +122,13 @@ public void setNamespace(String namespace) { this.namespace = namespace; } - @JsonProperty("port") - public Integer getPort() { - return port; - } - - @JsonProperty("port") - public void setPort(Integer port) { - this.port = port; - } - - @JsonProperty("weight") - public Integer getWeight() { - return weight; - } - - @JsonProperty("weight") - public void setWeight(Integer weight) { - this.weight = weight; - } - @JsonIgnore - public BackendRefBuilder edit() { - return new BackendRefBuilder(this); + public ObjectReferenceBuilder edit() { + return new ObjectReferenceBuilder(this); } @JsonIgnore - public BackendRefBuilder toBuilder() { + public ObjectReferenceBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/RouteNamespaces.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/RouteNamespaces.java index 137b321745f..36efa8e9958 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/RouteNamespaces.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/RouteNamespaces.java @@ -15,6 +15,7 @@ import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; +import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; @@ -41,7 +42,7 @@ }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { @BuildableReference(ObjectMeta.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LabelSelector.class), + @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCMethodMatch.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/SessionPersistence.java similarity index 61% rename from kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCMethodMatch.java rename to kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/SessionPersistence.java index d4fc578dd39..c894bbf2fff 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCMethodMatch.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/SessionPersistence.java @@ -1,5 +1,5 @@ -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; +package io.fabric8.kubernetes.api.model.gatewayapi.v1; import java.util.LinkedHashMap; import java.util.Map; @@ -31,8 +31,10 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "method", - "service", + "absoluteTimeout", + "cookieConfig", + "idleTimeout", + "sessionName", "type" }) @ToString @@ -53,13 +55,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class GRPCMethodMatch implements Editable , KubernetesResource +public class SessionPersistence implements Editable , KubernetesResource { - @JsonProperty("method") - private String method; - @JsonProperty("service") - private String service; + @JsonProperty("absoluteTimeout") + private String absoluteTimeout; + @JsonProperty("cookieConfig") + private CookieConfig cookieConfig; + @JsonProperty("idleTimeout") + private String idleTimeout; + @JsonProperty("sessionName") + private String sessionName; @JsonProperty("type") private String type; @JsonIgnore @@ -69,34 +75,56 @@ public class GRPCMethodMatch implements Editable , Kuber * No args constructor for use in serialization * */ - public GRPCMethodMatch() { + public SessionPersistence() { } - public GRPCMethodMatch(String method, String service, String type) { + public SessionPersistence(String absoluteTimeout, CookieConfig cookieConfig, String idleTimeout, String sessionName, String type) { super(); - this.method = method; - this.service = service; + this.absoluteTimeout = absoluteTimeout; + this.cookieConfig = cookieConfig; + this.idleTimeout = idleTimeout; + this.sessionName = sessionName; this.type = type; } - @JsonProperty("method") - public String getMethod() { - return method; + @JsonProperty("absoluteTimeout") + public String getAbsoluteTimeout() { + return absoluteTimeout; } - @JsonProperty("method") - public void setMethod(String method) { - this.method = method; + @JsonProperty("absoluteTimeout") + public void setAbsoluteTimeout(String absoluteTimeout) { + this.absoluteTimeout = absoluteTimeout; } - @JsonProperty("service") - public String getService() { - return service; + @JsonProperty("cookieConfig") + public CookieConfig getCookieConfig() { + return cookieConfig; } - @JsonProperty("service") - public void setService(String service) { - this.service = service; + @JsonProperty("cookieConfig") + public void setCookieConfig(CookieConfig cookieConfig) { + this.cookieConfig = cookieConfig; + } + + @JsonProperty("idleTimeout") + public String getIdleTimeout() { + return idleTimeout; + } + + @JsonProperty("idleTimeout") + public void setIdleTimeout(String idleTimeout) { + this.idleTimeout = idleTimeout; + } + + @JsonProperty("sessionName") + public String getSessionName() { + return sessionName; + } + + @JsonProperty("sessionName") + public void setSessionName(String sessionName) { + this.sessionName = sessionName; } @JsonProperty("type") @@ -110,12 +138,12 @@ public void setType(String type) { } @JsonIgnore - public GRPCMethodMatchBuilder edit() { - return new GRPCMethodMatchBuilder(this); + public SessionPersistenceBuilder edit() { + return new SessionPersistenceBuilder(this); } @JsonIgnore - public GRPCMethodMatchBuilder toBuilder() { + public SessionPersistenceBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicy.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicy.java deleted file mode 100644 index c7d9a6b79a9..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicy.java +++ /dev/null @@ -1,203 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.Namespaced; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "spec", - "status" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class BackendTLSPolicy implements Editable , HasMetadata, Namespaced -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "BackendTLSPolicy"; - @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; - @JsonProperty("spec") - private BackendTLSPolicySpec spec; - @JsonProperty("status") - private PolicyStatus status; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public BackendTLSPolicy() { - } - - public BackendTLSPolicy(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, BackendTLSPolicySpec spec, PolicyStatus status) { - super(); - this.apiVersion = apiVersion; - this.kind = kind; - this.metadata = metadata; - this.spec = spec; - this.status = status; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { - this.metadata = metadata; - } - - @JsonProperty("spec") - public BackendTLSPolicySpec getSpec() { - return spec; - } - - @JsonProperty("spec") - public void setSpec(BackendTLSPolicySpec spec) { - this.spec = spec; - } - - @JsonProperty("status") - public PolicyStatus getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(PolicyStatus status) { - this.status = status; - } - - @JsonIgnore - public BackendTLSPolicyBuilder edit() { - return new BackendTLSPolicyBuilder(this); - } - - @JsonIgnore - public BackendTLSPolicyBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicyConfig.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicyConfig.java deleted file mode 100644 index cafd631057b..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicyConfig.java +++ /dev/null @@ -1,139 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "caCertRefs", - "hostname", - "wellKnownCACerts" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class BackendTLSPolicyConfig implements Editable , KubernetesResource -{ - - @JsonProperty("caCertRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List caCertRefs = new ArrayList<>(); - @JsonProperty("hostname") - private String hostname; - @JsonProperty("wellKnownCACerts") - private String wellKnownCACerts; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public BackendTLSPolicyConfig() { - } - - public BackendTLSPolicyConfig(List caCertRefs, String hostname, String wellKnownCACerts) { - super(); - this.caCertRefs = caCertRefs; - this.hostname = hostname; - this.wellKnownCACerts = wellKnownCACerts; - } - - @JsonProperty("caCertRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getCaCertRefs() { - return caCertRefs; - } - - @JsonProperty("caCertRefs") - public void setCaCertRefs(List caCertRefs) { - this.caCertRefs = caCertRefs; - } - - @JsonProperty("hostname") - public String getHostname() { - return hostname; - } - - @JsonProperty("hostname") - public void setHostname(String hostname) { - this.hostname = hostname; - } - - @JsonProperty("wellKnownCACerts") - public String getWellKnownCACerts() { - return wellKnownCACerts; - } - - @JsonProperty("wellKnownCACerts") - public void setWellKnownCACerts(String wellKnownCACerts) { - this.wellKnownCACerts = wellKnownCACerts; - } - - @JsonIgnore - public BackendTLSPolicyConfigBuilder edit() { - return new BackendTLSPolicyConfigBuilder(this); - } - - @JsonIgnore - public BackendTLSPolicyConfigBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicyList.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicyList.java deleted file mode 100644 index a21ebd03e73..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicyList.java +++ /dev/null @@ -1,195 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.KubernetesResourceList; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ListMeta; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "items" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class BackendTLSPolicyList implements Editable , KubernetesResource, KubernetesResourceList -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "BackendTLSPolicyList"; - @JsonProperty("metadata") - private ListMeta metadata; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public BackendTLSPolicyList() { - } - - public BackendTLSPolicyList(String apiVersion, List items, String kind, ListMeta metadata) { - super(); - this.apiVersion = apiVersion; - this.items = items; - this.kind = kind; - this.metadata = metadata; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { - return items; - } - - @JsonProperty("items") - public void setItems(List items) { - this.items = items; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public ListMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(ListMeta metadata) { - this.metadata = metadata; - } - - @JsonIgnore - public BackendTLSPolicyListBuilder edit() { - return new BackendTLSPolicyListBuilder(this); - } - - @JsonIgnore - public BackendTLSPolicyListBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicySpec.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicySpec.java deleted file mode 100644 index 68ae87f2f0e..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/BackendTLSPolicySpec.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "targetRef", - "tls" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class BackendTLSPolicySpec implements Editable , KubernetesResource -{ - - @JsonProperty("targetRef") - private PolicyTargetReferenceWithSectionName targetRef; - @JsonProperty("tls") - private BackendTLSPolicyConfig tls; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public BackendTLSPolicySpec() { - } - - public BackendTLSPolicySpec(PolicyTargetReferenceWithSectionName targetRef, BackendTLSPolicyConfig tls) { - super(); - this.targetRef = targetRef; - this.tls = tls; - } - - @JsonProperty("targetRef") - public PolicyTargetReferenceWithSectionName getTargetRef() { - return targetRef; - } - - @JsonProperty("targetRef") - public void setTargetRef(PolicyTargetReferenceWithSectionName targetRef) { - this.targetRef = targetRef; - } - - @JsonProperty("tls") - public BackendTLSPolicyConfig getTls() { - return tls; - } - - @JsonProperty("tls") - public void setTls(BackendTLSPolicyConfig tls) { - this.tls = tls; - } - - @JsonIgnore - public BackendTLSPolicySpecBuilder edit() { - return new BackendTLSPolicySpecBuilder(this); - } - - @JsonIgnore - public BackendTLSPolicySpecBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCBackendRef.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCBackendRef.java deleted file mode 100644 index 9477dd13028..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCBackendRef.java +++ /dev/null @@ -1,211 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "kind", - "filters", - "group", - "name", - "namespace", - "port", - "weight" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class GRPCBackendRef implements Editable , KubernetesResource -{ - - @JsonProperty("filters") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List filters = new ArrayList<>(); - @JsonProperty("group") - private String group; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "GRPCBackendRef"; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("port") - private Integer port; - @JsonProperty("weight") - private Integer weight; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public GRPCBackendRef() { - } - - public GRPCBackendRef(List filters, String group, String kind, String name, String namespace, Integer port, Integer weight) { - super(); - this.filters = filters; - this.group = group; - this.kind = kind; - this.name = name; - this.namespace = namespace; - this.port = port; - this.weight = weight; - } - - @JsonProperty("filters") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getFilters() { - return filters; - } - - @JsonProperty("filters") - public void setFilters(List filters) { - this.filters = filters; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonProperty("namespace") - public String getNamespace() { - return namespace; - } - - @JsonProperty("namespace") - public void setNamespace(String namespace) { - this.namespace = namespace; - } - - @JsonProperty("port") - public Integer getPort() { - return port; - } - - @JsonProperty("port") - public void setPort(Integer port) { - this.port = port; - } - - @JsonProperty("weight") - public Integer getWeight() { - return weight; - } - - @JsonProperty("weight") - public void setWeight(Integer weight) { - this.weight = weight; - } - - @JsonIgnore - public GRPCBackendRefBuilder edit() { - return new GRPCBackendRefBuilder(this); - } - - @JsonIgnore - public GRPCBackendRefBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRoute.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRoute.java deleted file mode 100644 index 0a5f9317e30..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRoute.java +++ /dev/null @@ -1,203 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.Namespaced; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "spec", - "status" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class GRPCRoute implements Editable , HasMetadata, Namespaced -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "GRPCRoute"; - @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; - @JsonProperty("spec") - private GRPCRouteSpec spec; - @JsonProperty("status") - private GRPCRouteStatus status; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public GRPCRoute() { - } - - public GRPCRoute(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, GRPCRouteSpec spec, GRPCRouteStatus status) { - super(); - this.apiVersion = apiVersion; - this.kind = kind; - this.metadata = metadata; - this.spec = spec; - this.status = status; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { - this.metadata = metadata; - } - - @JsonProperty("spec") - public GRPCRouteSpec getSpec() { - return spec; - } - - @JsonProperty("spec") - public void setSpec(GRPCRouteSpec spec) { - this.spec = spec; - } - - @JsonProperty("status") - public GRPCRouteStatus getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(GRPCRouteStatus status) { - this.status = status; - } - - @JsonIgnore - public GRPCRouteBuilder edit() { - return new GRPCRouteBuilder(this); - } - - @JsonIgnore - public GRPCRouteBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteFilter.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteFilter.java deleted file mode 100644 index ecdcd7121d4..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteFilter.java +++ /dev/null @@ -1,165 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPHeaderFilter; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRequestMirrorFilter; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "extensionRef", - "requestHeaderModifier", - "requestMirror", - "responseHeaderModifier", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(io.fabric8.kubernetes.api.model.LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class GRPCRouteFilter implements Editable , KubernetesResource -{ - - @JsonProperty("extensionRef") - private io.fabric8.kubernetes.api.model.gatewayapi.v1.LocalObjectReference extensionRef; - @JsonProperty("requestHeaderModifier") - private HTTPHeaderFilter requestHeaderModifier; - @JsonProperty("requestMirror") - private HTTPRequestMirrorFilter requestMirror; - @JsonProperty("responseHeaderModifier") - private HTTPHeaderFilter responseHeaderModifier; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public GRPCRouteFilter() { - } - - public GRPCRouteFilter(io.fabric8.kubernetes.api.model.gatewayapi.v1.LocalObjectReference extensionRef, HTTPHeaderFilter requestHeaderModifier, HTTPRequestMirrorFilter requestMirror, HTTPHeaderFilter responseHeaderModifier, String type) { - super(); - this.extensionRef = extensionRef; - this.requestHeaderModifier = requestHeaderModifier; - this.requestMirror = requestMirror; - this.responseHeaderModifier = responseHeaderModifier; - this.type = type; - } - - @JsonProperty("extensionRef") - public io.fabric8.kubernetes.api.model.gatewayapi.v1.LocalObjectReference getExtensionRef() { - return extensionRef; - } - - @JsonProperty("extensionRef") - public void setExtensionRef(io.fabric8.kubernetes.api.model.gatewayapi.v1.LocalObjectReference extensionRef) { - this.extensionRef = extensionRef; - } - - @JsonProperty("requestHeaderModifier") - public HTTPHeaderFilter getRequestHeaderModifier() { - return requestHeaderModifier; - } - - @JsonProperty("requestHeaderModifier") - public void setRequestHeaderModifier(HTTPHeaderFilter requestHeaderModifier) { - this.requestHeaderModifier = requestHeaderModifier; - } - - @JsonProperty("requestMirror") - public HTTPRequestMirrorFilter getRequestMirror() { - return requestMirror; - } - - @JsonProperty("requestMirror") - public void setRequestMirror(HTTPRequestMirrorFilter requestMirror) { - this.requestMirror = requestMirror; - } - - @JsonProperty("responseHeaderModifier") - public HTTPHeaderFilter getResponseHeaderModifier() { - return responseHeaderModifier; - } - - @JsonProperty("responseHeaderModifier") - public void setResponseHeaderModifier(HTTPHeaderFilter responseHeaderModifier) { - this.responseHeaderModifier = responseHeaderModifier; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public GRPCRouteFilterBuilder edit() { - return new GRPCRouteFilterBuilder(this); - } - - @JsonIgnore - public GRPCRouteFilterBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteList.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteList.java deleted file mode 100644 index f60a5a7b4ec..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteList.java +++ /dev/null @@ -1,195 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.KubernetesResourceList; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ListMeta; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "items" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class GRPCRouteList implements Editable , KubernetesResource, KubernetesResourceList -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "GRPCRouteList"; - @JsonProperty("metadata") - private ListMeta metadata; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public GRPCRouteList() { - } - - public GRPCRouteList(String apiVersion, List items, String kind, ListMeta metadata) { - super(); - this.apiVersion = apiVersion; - this.items = items; - this.kind = kind; - this.metadata = metadata; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { - return items; - } - - @JsonProperty("items") - public void setItems(List items) { - this.items = items; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public ListMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(ListMeta metadata) { - this.metadata = metadata; - } - - @JsonIgnore - public GRPCRouteListBuilder edit() { - return new GRPCRouteListBuilder(this); - } - - @JsonIgnore - public GRPCRouteListBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteMatch.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteMatch.java deleted file mode 100644 index e7a8e519dc6..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteMatch.java +++ /dev/null @@ -1,126 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "headers", - "method" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class GRPCRouteMatch implements Editable , KubernetesResource -{ - - @JsonProperty("headers") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List headers = new ArrayList<>(); - @JsonProperty("method") - private GRPCMethodMatch method; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public GRPCRouteMatch() { - } - - public GRPCRouteMatch(List headers, GRPCMethodMatch method) { - super(); - this.headers = headers; - this.method = method; - } - - @JsonProperty("headers") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getHeaders() { - return headers; - } - - @JsonProperty("headers") - public void setHeaders(List headers) { - this.headers = headers; - } - - @JsonProperty("method") - public GRPCMethodMatch getMethod() { - return method; - } - - @JsonProperty("method") - public void setMethod(GRPCMethodMatch method) { - this.method = method; - } - - @JsonIgnore - public GRPCRouteMatchBuilder edit() { - return new GRPCRouteMatchBuilder(this); - } - - @JsonIgnore - public GRPCRouteMatchBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteRule.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteRule.java deleted file mode 100644 index 4815f031e5c..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteRule.java +++ /dev/null @@ -1,144 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "backendRefs", - "filters", - "matches" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class GRPCRouteRule implements Editable , KubernetesResource -{ - - @JsonProperty("backendRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List backendRefs = new ArrayList<>(); - @JsonProperty("filters") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List filters = new ArrayList<>(); - @JsonProperty("matches") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matches = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public GRPCRouteRule() { - } - - public GRPCRouteRule(List backendRefs, List filters, List matches) { - super(); - this.backendRefs = backendRefs; - this.filters = filters; - this.matches = matches; - } - - @JsonProperty("backendRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getBackendRefs() { - return backendRefs; - } - - @JsonProperty("backendRefs") - public void setBackendRefs(List backendRefs) { - this.backendRefs = backendRefs; - } - - @JsonProperty("filters") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getFilters() { - return filters; - } - - @JsonProperty("filters") - public void setFilters(List filters) { - this.filters = filters; - } - - @JsonProperty("matches") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatches() { - return matches; - } - - @JsonProperty("matches") - public void setMatches(List matches) { - this.matches = matches; - } - - @JsonIgnore - public GRPCRouteRuleBuilder edit() { - return new GRPCRouteRuleBuilder(this); - } - - @JsonIgnore - public GRPCRouteRuleBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteSpec.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteSpec.java deleted file mode 100644 index 3c046f42288..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GRPCRouteSpec.java +++ /dev/null @@ -1,145 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.ParentReference; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "hostnames", - "parentRefs", - "rules" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class GRPCRouteSpec implements Editable , KubernetesResource -{ - - @JsonProperty("hostnames") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List hostnames = new ArrayList<>(); - @JsonProperty("parentRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List parentRefs = new ArrayList<>(); - @JsonProperty("rules") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List rules = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public GRPCRouteSpec() { - } - - public GRPCRouteSpec(List hostnames, List parentRefs, List rules) { - super(); - this.hostnames = hostnames; - this.parentRefs = parentRefs; - this.rules = rules; - } - - @JsonProperty("hostnames") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getHostnames() { - return hostnames; - } - - @JsonProperty("hostnames") - public void setHostnames(List hostnames) { - this.hostnames = hostnames; - } - - @JsonProperty("parentRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getParentRefs() { - return parentRefs; - } - - @JsonProperty("parentRefs") - public void setParentRefs(List parentRefs) { - this.parentRefs = parentRefs; - } - - @JsonProperty("rules") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRules() { - return rules; - } - - @JsonProperty("rules") - public void setRules(List rules) { - this.rules = rules; - } - - @JsonIgnore - public GRPCRouteSpecBuilder edit() { - return new GRPCRouteSpecBuilder(this); - } - - @JsonIgnore - public GRPCRouteSpecBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/Gateway.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/Gateway.java deleted file mode 100644 index 6cc127ee462..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/Gateway.java +++ /dev/null @@ -1,205 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.Namespaced; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewaySpec; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayStatus; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "spec", - "status" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class Gateway implements Editable , HasMetadata, Namespaced -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "Gateway"; - @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; - @JsonProperty("spec") - private GatewaySpec spec; - @JsonProperty("status") - private GatewayStatus status; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public Gateway() { - } - - public Gateway(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, GatewaySpec spec, GatewayStatus status) { - super(); - this.apiVersion = apiVersion; - this.kind = kind; - this.metadata = metadata; - this.spec = spec; - this.status = status; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { - this.metadata = metadata; - } - - @JsonProperty("spec") - public GatewaySpec getSpec() { - return spec; - } - - @JsonProperty("spec") - public void setSpec(GatewaySpec spec) { - this.spec = spec; - } - - @JsonProperty("status") - public GatewayStatus getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(GatewayStatus status) { - this.status = status; - } - - @JsonIgnore - public GatewayBuilder edit() { - return new GatewayBuilder(this); - } - - @JsonIgnore - public GatewayBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GatewayClass.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GatewayClass.java deleted file mode 100644 index de3d9f8e35f..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GatewayClass.java +++ /dev/null @@ -1,204 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClassSpec; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClassStatus; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "spec", - "status" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class GatewayClass implements Editable , HasMetadata -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "GatewayClass"; - @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; - @JsonProperty("spec") - private GatewayClassSpec spec; - @JsonProperty("status") - private GatewayClassStatus status; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public GatewayClass() { - } - - public GatewayClass(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, GatewayClassSpec spec, GatewayClassStatus status) { - super(); - this.apiVersion = apiVersion; - this.kind = kind; - this.metadata = metadata; - this.spec = spec; - this.status = status; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { - this.metadata = metadata; - } - - @JsonProperty("spec") - public GatewayClassSpec getSpec() { - return spec; - } - - @JsonProperty("spec") - public void setSpec(GatewayClassSpec spec) { - this.spec = spec; - } - - @JsonProperty("status") - public GatewayClassStatus getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(GatewayClassStatus status) { - this.status = status; - } - - @JsonIgnore - public GatewayClassBuilder edit() { - return new GatewayClassBuilder(this); - } - - @JsonIgnore - public GatewayClassBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GatewayClassList.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GatewayClassList.java deleted file mode 100644 index 2ddaa5d123e..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GatewayClassList.java +++ /dev/null @@ -1,195 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.KubernetesResourceList; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ListMeta; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "items" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class GatewayClassList implements Editable , KubernetesResource, KubernetesResourceList -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "GatewayClassList"; - @JsonProperty("metadata") - private ListMeta metadata; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public GatewayClassList() { - } - - public GatewayClassList(String apiVersion, List items, String kind, ListMeta metadata) { - super(); - this.apiVersion = apiVersion; - this.items = items; - this.kind = kind; - this.metadata = metadata; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { - return items; - } - - @JsonProperty("items") - public void setItems(List items) { - this.items = items; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public ListMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(ListMeta metadata) { - this.metadata = metadata; - } - - @JsonIgnore - public GatewayClassListBuilder edit() { - return new GatewayClassListBuilder(this); - } - - @JsonIgnore - public GatewayClassListBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GatewayList.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GatewayList.java deleted file mode 100644 index af6d9aeb404..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/GatewayList.java +++ /dev/null @@ -1,195 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.KubernetesResourceList; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ListMeta; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "items" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class GatewayList implements Editable , KubernetesResource, KubernetesResourceList -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "GatewayList"; - @JsonProperty("metadata") - private ListMeta metadata; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public GatewayList() { - } - - public GatewayList(String apiVersion, List items, String kind, ListMeta metadata) { - super(); - this.apiVersion = apiVersion; - this.items = items; - this.kind = kind; - this.metadata = metadata; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { - return items; - } - - @JsonProperty("items") - public void setItems(List items) { - this.items = items; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public ListMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(ListMeta metadata) { - this.metadata = metadata; - } - - @JsonIgnore - public GatewayListBuilder edit() { - return new GatewayListBuilder(this); - } - - @JsonIgnore - public GatewayListBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/HTTPRoute.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/HTTPRoute.java deleted file mode 100644 index c8ef6a233b5..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/HTTPRoute.java +++ /dev/null @@ -1,205 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.Namespaced; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRouteSpec; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRouteStatus; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "spec", - "status" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class HTTPRoute implements Editable , HasMetadata, Namespaced -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "HTTPRoute"; - @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; - @JsonProperty("spec") - private HTTPRouteSpec spec; - @JsonProperty("status") - private HTTPRouteStatus status; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public HTTPRoute() { - } - - public HTTPRoute(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, HTTPRouteSpec spec, HTTPRouteStatus status) { - super(); - this.apiVersion = apiVersion; - this.kind = kind; - this.metadata = metadata; - this.spec = spec; - this.status = status; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { - this.metadata = metadata; - } - - @JsonProperty("spec") - public HTTPRouteSpec getSpec() { - return spec; - } - - @JsonProperty("spec") - public void setSpec(HTTPRouteSpec spec) { - this.spec = spec; - } - - @JsonProperty("status") - public HTTPRouteStatus getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(HTTPRouteStatus status) { - this.status = status; - } - - @JsonIgnore - public HTTPRouteBuilder edit() { - return new HTTPRouteBuilder(this); - } - - @JsonIgnore - public HTTPRouteBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/HTTPRouteList.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/HTTPRouteList.java deleted file mode 100644 index 6cb0e692b91..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/HTTPRouteList.java +++ /dev/null @@ -1,195 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.KubernetesResourceList; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ListMeta; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "items" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class HTTPRouteList implements Editable , KubernetesResource, KubernetesResourceList -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "HTTPRouteList"; - @JsonProperty("metadata") - private ListMeta metadata; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public HTTPRouteList() { - } - - public HTTPRouteList(String apiVersion, List items, String kind, ListMeta metadata) { - super(); - this.apiVersion = apiVersion; - this.items = items; - this.kind = kind; - this.metadata = metadata; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { - return items; - } - - @JsonProperty("items") - public void setItems(List items) { - this.items = items; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public ListMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(ListMeta metadata) { - this.metadata = metadata; - } - - @JsonIgnore - public HTTPRouteListBuilder edit() { - return new HTTPRouteListBuilder(this); - } - - @JsonIgnore - public HTTPRouteListBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/PolicyAncestorStatus.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/PolicyAncestorStatus.java deleted file mode 100644 index 8598261322e..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/PolicyAncestorStatus.java +++ /dev/null @@ -1,142 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Condition; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.ParentReference; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "ancestorRef", - "conditions", - "controllerName" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class PolicyAncestorStatus implements Editable , KubernetesResource -{ - - @JsonProperty("ancestorRef") - private ParentReference ancestorRef; - @JsonProperty("conditions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); - @JsonProperty("controllerName") - private String controllerName; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public PolicyAncestorStatus() { - } - - public PolicyAncestorStatus(ParentReference ancestorRef, List conditions, String controllerName) { - super(); - this.ancestorRef = ancestorRef; - this.conditions = conditions; - this.controllerName = controllerName; - } - - @JsonProperty("ancestorRef") - public ParentReference getAncestorRef() { - return ancestorRef; - } - - @JsonProperty("ancestorRef") - public void setAncestorRef(ParentReference ancestorRef) { - this.ancestorRef = ancestorRef; - } - - @JsonProperty("conditions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { - return conditions; - } - - @JsonProperty("conditions") - public void setConditions(List conditions) { - this.conditions = conditions; - } - - @JsonProperty("controllerName") - public String getControllerName() { - return controllerName; - } - - @JsonProperty("controllerName") - public void setControllerName(String controllerName) { - this.controllerName = controllerName; - } - - @JsonIgnore - public PolicyAncestorStatusBuilder edit() { - return new PolicyAncestorStatusBuilder(this); - } - - @JsonIgnore - public PolicyAncestorStatusBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/PolicyTargetReferenceWithSectionName.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/PolicyTargetReferenceWithSectionName.java deleted file mode 100644 index e14158b871c..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/PolicyTargetReferenceWithSectionName.java +++ /dev/null @@ -1,179 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "kind", - "group", - "name", - "namespace", - "sectionName" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class PolicyTargetReferenceWithSectionName implements Editable , KubernetesResource -{ - - @JsonProperty("group") - private String group; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "PolicyTargetReferenceWithSectionName"; - @JsonProperty("name") - private String name; - @JsonProperty("namespace") - private String namespace; - @JsonProperty("sectionName") - private String sectionName; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public PolicyTargetReferenceWithSectionName() { - } - - public PolicyTargetReferenceWithSectionName(String group, String kind, String name, String namespace, String sectionName) { - super(); - this.group = group; - this.kind = kind; - this.name = name; - this.namespace = namespace; - this.sectionName = sectionName; - } - - @JsonProperty("group") - public String getGroup() { - return group; - } - - @JsonProperty("group") - public void setGroup(String group) { - this.group = group; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonProperty("namespace") - public String getNamespace() { - return namespace; - } - - @JsonProperty("namespace") - public void setNamespace(String namespace) { - this.namespace = namespace; - } - - @JsonProperty("sectionName") - public String getSectionName() { - return sectionName; - } - - @JsonProperty("sectionName") - public void setSectionName(String sectionName) { - this.sectionName = sectionName; - } - - @JsonIgnore - public PolicyTargetReferenceWithSectionNameBuilder edit() { - return new PolicyTargetReferenceWithSectionNameBuilder(this); - } - - @JsonIgnore - public PolicyTargetReferenceWithSectionNameBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/ReferenceGrant.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/ReferenceGrant.java deleted file mode 100644 index d00897f9f61..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/ReferenceGrant.java +++ /dev/null @@ -1,190 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.Namespaced; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantSpec; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "spec" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class ReferenceGrant implements Editable , HasMetadata, Namespaced -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "ReferenceGrant"; - @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; - @JsonProperty("spec") - private ReferenceGrantSpec spec; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ReferenceGrant() { - } - - public ReferenceGrant(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ReferenceGrantSpec spec) { - super(); - this.apiVersion = apiVersion; - this.kind = kind; - this.metadata = metadata; - this.spec = spec; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { - this.metadata = metadata; - } - - @JsonProperty("spec") - public ReferenceGrantSpec getSpec() { - return spec; - } - - @JsonProperty("spec") - public void setSpec(ReferenceGrantSpec spec) { - this.spec = spec; - } - - @JsonIgnore - public ReferenceGrantBuilder edit() { - return new ReferenceGrantBuilder(this); - } - - @JsonIgnore - public ReferenceGrantBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/ReferenceGrantList.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/ReferenceGrantList.java deleted file mode 100644 index 284260f745c..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/ReferenceGrantList.java +++ /dev/null @@ -1,195 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.KubernetesResourceList; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ListMeta; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "items" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class ReferenceGrantList implements Editable , KubernetesResource, KubernetesResourceList -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "ReferenceGrantList"; - @JsonProperty("metadata") - private ListMeta metadata; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ReferenceGrantList() { - } - - public ReferenceGrantList(String apiVersion, List items, String kind, ListMeta metadata) { - super(); - this.apiVersion = apiVersion; - this.items = items; - this.kind = kind; - this.metadata = metadata; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { - return items; - } - - @JsonProperty("items") - public void setItems(List items) { - this.items = items; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public ListMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(ListMeta metadata) { - this.metadata = metadata; - } - - @JsonIgnore - public ReferenceGrantListBuilder edit() { - return new ReferenceGrantListBuilder(this); - } - - @JsonIgnore - public ReferenceGrantListBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRoute.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRoute.java deleted file mode 100644 index 066b012593d..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRoute.java +++ /dev/null @@ -1,203 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.Namespaced; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "spec", - "status" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class TCPRoute implements Editable , HasMetadata, Namespaced -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "TCPRoute"; - @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; - @JsonProperty("spec") - private TCPRouteSpec spec; - @JsonProperty("status") - private TCPRouteStatus status; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public TCPRoute() { - } - - public TCPRoute(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, TCPRouteSpec spec, TCPRouteStatus status) { - super(); - this.apiVersion = apiVersion; - this.kind = kind; - this.metadata = metadata; - this.spec = spec; - this.status = status; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { - this.metadata = metadata; - } - - @JsonProperty("spec") - public TCPRouteSpec getSpec() { - return spec; - } - - @JsonProperty("spec") - public void setSpec(TCPRouteSpec spec) { - this.spec = spec; - } - - @JsonProperty("status") - public TCPRouteStatus getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(TCPRouteStatus status) { - this.status = status; - } - - @JsonIgnore - public TCPRouteBuilder edit() { - return new TCPRouteBuilder(this); - } - - @JsonIgnore - public TCPRouteBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteList.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteList.java deleted file mode 100644 index 2e46bf4634d..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteList.java +++ /dev/null @@ -1,195 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.KubernetesResourceList; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ListMeta; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "items" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class TCPRouteList implements Editable , KubernetesResource, KubernetesResourceList -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "TCPRouteList"; - @JsonProperty("metadata") - private ListMeta metadata; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public TCPRouteList() { - } - - public TCPRouteList(String apiVersion, List items, String kind, ListMeta metadata) { - super(); - this.apiVersion = apiVersion; - this.items = items; - this.kind = kind; - this.metadata = metadata; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { - return items; - } - - @JsonProperty("items") - public void setItems(List items) { - this.items = items; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public ListMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(ListMeta metadata) { - this.metadata = metadata; - } - - @JsonIgnore - public TCPRouteListBuilder edit() { - return new TCPRouteListBuilder(this); - } - - @JsonIgnore - public TCPRouteListBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteRule.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteRule.java deleted file mode 100644 index 7a96af0a00d..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteRule.java +++ /dev/null @@ -1,113 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.BackendRef; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "backendRefs" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class TCPRouteRule implements Editable , KubernetesResource -{ - - @JsonProperty("backendRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List backendRefs = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public TCPRouteRule() { - } - - public TCPRouteRule(List backendRefs) { - super(); - this.backendRefs = backendRefs; - } - - @JsonProperty("backendRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getBackendRefs() { - return backendRefs; - } - - @JsonProperty("backendRefs") - public void setBackendRefs(List backendRefs) { - this.backendRefs = backendRefs; - } - - @JsonIgnore - public TCPRouteRuleBuilder edit() { - return new TCPRouteRuleBuilder(this); - } - - @JsonIgnore - public TCPRouteRuleBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteSpec.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteSpec.java deleted file mode 100644 index 29bbb10b2cb..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteSpec.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.ParentReference; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "parentRefs", - "rules" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class TCPRouteSpec implements Editable , KubernetesResource -{ - - @JsonProperty("parentRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List parentRefs = new ArrayList<>(); - @JsonProperty("rules") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List rules = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public TCPRouteSpec() { - } - - public TCPRouteSpec(List parentRefs, List rules) { - super(); - this.parentRefs = parentRefs; - this.rules = rules; - } - - @JsonProperty("parentRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getParentRefs() { - return parentRefs; - } - - @JsonProperty("parentRefs") - public void setParentRefs(List parentRefs) { - this.parentRefs = parentRefs; - } - - @JsonProperty("rules") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRules() { - return rules; - } - - @JsonProperty("rules") - public void setRules(List rules) { - this.rules = rules; - } - - @JsonIgnore - public TCPRouteSpecBuilder edit() { - return new TCPRouteSpecBuilder(this); - } - - @JsonIgnore - public TCPRouteSpecBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteStatus.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteStatus.java deleted file mode 100644 index ede09522999..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TCPRouteStatus.java +++ /dev/null @@ -1,113 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.RouteParentStatus; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "parents" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class TCPRouteStatus implements Editable , KubernetesResource -{ - - @JsonProperty("parents") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List parents = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public TCPRouteStatus() { - } - - public TCPRouteStatus(List parents) { - super(); - this.parents = parents; - } - - @JsonProperty("parents") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getParents() { - return parents; - } - - @JsonProperty("parents") - public void setParents(List parents) { - this.parents = parents; - } - - @JsonIgnore - public TCPRouteStatusBuilder edit() { - return new TCPRouteStatusBuilder(this); - } - - @JsonIgnore - public TCPRouteStatusBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRoute.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRoute.java deleted file mode 100644 index 29452ba0361..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRoute.java +++ /dev/null @@ -1,203 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.Namespaced; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "spec", - "status" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class TLSRoute implements Editable , HasMetadata, Namespaced -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "TLSRoute"; - @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; - @JsonProperty("spec") - private TLSRouteSpec spec; - @JsonProperty("status") - private TLSRouteStatus status; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public TLSRoute() { - } - - public TLSRoute(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, TLSRouteSpec spec, TLSRouteStatus status) { - super(); - this.apiVersion = apiVersion; - this.kind = kind; - this.metadata = metadata; - this.spec = spec; - this.status = status; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { - this.metadata = metadata; - } - - @JsonProperty("spec") - public TLSRouteSpec getSpec() { - return spec; - } - - @JsonProperty("spec") - public void setSpec(TLSRouteSpec spec) { - this.spec = spec; - } - - @JsonProperty("status") - public TLSRouteStatus getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(TLSRouteStatus status) { - this.status = status; - } - - @JsonIgnore - public TLSRouteBuilder edit() { - return new TLSRouteBuilder(this); - } - - @JsonIgnore - public TLSRouteBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteList.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteList.java deleted file mode 100644 index 0f55a267681..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteList.java +++ /dev/null @@ -1,195 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.KubernetesResourceList; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ListMeta; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "items" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class TLSRouteList implements Editable , KubernetesResource, KubernetesResourceList -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "TLSRouteList"; - @JsonProperty("metadata") - private ListMeta metadata; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public TLSRouteList() { - } - - public TLSRouteList(String apiVersion, List items, String kind, ListMeta metadata) { - super(); - this.apiVersion = apiVersion; - this.items = items; - this.kind = kind; - this.metadata = metadata; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { - return items; - } - - @JsonProperty("items") - public void setItems(List items) { - this.items = items; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public ListMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(ListMeta metadata) { - this.metadata = metadata; - } - - @JsonIgnore - public TLSRouteListBuilder edit() { - return new TLSRouteListBuilder(this); - } - - @JsonIgnore - public TLSRouteListBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteRule.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteRule.java deleted file mode 100644 index 9ba3369d014..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteRule.java +++ /dev/null @@ -1,113 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.BackendRef; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "backendRefs" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class TLSRouteRule implements Editable , KubernetesResource -{ - - @JsonProperty("backendRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List backendRefs = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public TLSRouteRule() { - } - - public TLSRouteRule(List backendRefs) { - super(); - this.backendRefs = backendRefs; - } - - @JsonProperty("backendRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getBackendRefs() { - return backendRefs; - } - - @JsonProperty("backendRefs") - public void setBackendRefs(List backendRefs) { - this.backendRefs = backendRefs; - } - - @JsonIgnore - public TLSRouteRuleBuilder edit() { - return new TLSRouteRuleBuilder(this); - } - - @JsonIgnore - public TLSRouteRuleBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteSpec.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteSpec.java deleted file mode 100644 index 8370176ad53..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteSpec.java +++ /dev/null @@ -1,145 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.ParentReference; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "hostnames", - "parentRefs", - "rules" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class TLSRouteSpec implements Editable , KubernetesResource -{ - - @JsonProperty("hostnames") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List hostnames = new ArrayList<>(); - @JsonProperty("parentRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List parentRefs = new ArrayList<>(); - @JsonProperty("rules") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List rules = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public TLSRouteSpec() { - } - - public TLSRouteSpec(List hostnames, List parentRefs, List rules) { - super(); - this.hostnames = hostnames; - this.parentRefs = parentRefs; - this.rules = rules; - } - - @JsonProperty("hostnames") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getHostnames() { - return hostnames; - } - - @JsonProperty("hostnames") - public void setHostnames(List hostnames) { - this.hostnames = hostnames; - } - - @JsonProperty("parentRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getParentRefs() { - return parentRefs; - } - - @JsonProperty("parentRefs") - public void setParentRefs(List parentRefs) { - this.parentRefs = parentRefs; - } - - @JsonProperty("rules") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRules() { - return rules; - } - - @JsonProperty("rules") - public void setRules(List rules) { - this.rules = rules; - } - - @JsonIgnore - public TLSRouteSpecBuilder edit() { - return new TLSRouteSpecBuilder(this); - } - - @JsonIgnore - public TLSRouteSpecBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteStatus.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteStatus.java deleted file mode 100644 index de48966f835..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/TLSRouteStatus.java +++ /dev/null @@ -1,113 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.RouteParentStatus; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "parents" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class TLSRouteStatus implements Editable , KubernetesResource -{ - - @JsonProperty("parents") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List parents = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public TLSRouteStatus() { - } - - public TLSRouteStatus(List parents) { - super(); - this.parents = parents; - } - - @JsonProperty("parents") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getParents() { - return parents; - } - - @JsonProperty("parents") - public void setParents(List parents) { - this.parents = parents; - } - - @JsonIgnore - public TLSRouteStatusBuilder edit() { - return new TLSRouteStatusBuilder(this); - } - - @JsonIgnore - public TLSRouteStatusBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRoute.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRoute.java deleted file mode 100644 index 37c00e55faa..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRoute.java +++ /dev/null @@ -1,203 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.LinkedHashMap; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.Namespaced; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "spec", - "status" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class UDPRoute implements Editable , HasMetadata, Namespaced -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "UDPRoute"; - @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; - @JsonProperty("spec") - private UDPRouteSpec spec; - @JsonProperty("status") - private UDPRouteStatus status; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public UDPRoute() { - } - - public UDPRoute(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, UDPRouteSpec spec, UDPRouteStatus status) { - super(); - this.apiVersion = apiVersion; - this.kind = kind; - this.metadata = metadata; - this.spec = spec; - this.status = status; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { - this.metadata = metadata; - } - - @JsonProperty("spec") - public UDPRouteSpec getSpec() { - return spec; - } - - @JsonProperty("spec") - public void setSpec(UDPRouteSpec spec) { - this.spec = spec; - } - - @JsonProperty("status") - public UDPRouteStatus getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(UDPRouteStatus status) { - this.status = status; - } - - @JsonIgnore - public UDPRouteBuilder edit() { - return new UDPRouteBuilder(this); - } - - @JsonIgnore - public UDPRouteBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteList.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteList.java deleted file mode 100644 index 6aa735ed442..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteList.java +++ /dev/null @@ -1,195 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.KubernetesResourceList; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.ListMeta; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.model.annotation.Group; -import io.fabric8.kubernetes.model.annotation.Version; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import io.sundr.transform.annotations.TemplateTransformation; -import io.sundr.transform.annotations.TemplateTransformations; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "items" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@TemplateTransformations({ - @TemplateTransformation(value = "/manifest.vm", outputPath = "META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource", gather = true) -}) -@Version("v1alpha2") -@Group("gateway.networking.k8s.io") -@Generated("jsonschema2pojo") -public class UDPRouteList implements Editable , KubernetesResource, KubernetesResourceList -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "gateway.networking.k8s.io/v1alpha2"; - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List items = new ArrayList<>(); - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "UDPRouteList"; - @JsonProperty("metadata") - private ListMeta metadata; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public UDPRouteList() { - } - - public UDPRouteList(String apiVersion, List items, String kind, ListMeta metadata) { - super(); - this.apiVersion = apiVersion; - this.items = items; - this.kind = kind; - this.metadata = metadata; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("items") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getItems() { - return items; - } - - @JsonProperty("items") - public void setItems(List items) { - this.items = items; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public ListMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(ListMeta metadata) { - this.metadata = metadata; - } - - @JsonIgnore - public UDPRouteListBuilder edit() { - return new UDPRouteListBuilder(this); - } - - @JsonIgnore - public UDPRouteListBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteRule.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteRule.java deleted file mode 100644 index 75f8129330d..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteRule.java +++ /dev/null @@ -1,113 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.BackendRef; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "backendRefs" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class UDPRouteRule implements Editable , KubernetesResource -{ - - @JsonProperty("backendRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List backendRefs = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public UDPRouteRule() { - } - - public UDPRouteRule(List backendRefs) { - super(); - this.backendRefs = backendRefs; - } - - @JsonProperty("backendRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getBackendRefs() { - return backendRefs; - } - - @JsonProperty("backendRefs") - public void setBackendRefs(List backendRefs) { - this.backendRefs = backendRefs; - } - - @JsonIgnore - public UDPRouteRuleBuilder edit() { - return new UDPRouteRuleBuilder(this); - } - - @JsonIgnore - public UDPRouteRuleBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteSpec.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteSpec.java deleted file mode 100644 index 75a96ca0864..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteSpec.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.ParentReference; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "parentRefs", - "rules" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class UDPRouteSpec implements Editable , KubernetesResource -{ - - @JsonProperty("parentRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List parentRefs = new ArrayList<>(); - @JsonProperty("rules") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List rules = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public UDPRouteSpec() { - } - - public UDPRouteSpec(List parentRefs, List rules) { - super(); - this.parentRefs = parentRefs; - this.rules = rules; - } - - @JsonProperty("parentRefs") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getParentRefs() { - return parentRefs; - } - - @JsonProperty("parentRefs") - public void setParentRefs(List parentRefs) { - this.parentRefs = parentRefs; - } - - @JsonProperty("rules") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRules() { - return rules; - } - - @JsonProperty("rules") - public void setRules(List rules) { - this.rules = rules; - } - - @JsonIgnore - public UDPRouteSpecBuilder edit() { - return new UDPRouteSpecBuilder(this); - } - - @JsonIgnore - public UDPRouteSpecBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteStatus.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteStatus.java deleted file mode 100644 index f077d5c7fee..00000000000 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1alpha2/UDPRouteStatus.java +++ /dev/null @@ -1,113 +0,0 @@ - -package io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import javax.annotation.Generated; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.fabric8.kubernetes.api.builder.Editable; -import io.fabric8.kubernetes.api.model.Container; -import io.fabric8.kubernetes.api.model.IntOrString; -import io.fabric8.kubernetes.api.model.KubernetesResource; -import io.fabric8.kubernetes.api.model.LabelSelector; -import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.api.model.ObjectReference; -import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; -import io.fabric8.kubernetes.api.model.PodTemplateSpec; -import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.kubernetes.api.model.gatewayapi.v1.RouteParentStatus; -import io.sundr.builder.annotations.Buildable; -import io.sundr.builder.annotations.BuildableReference; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "parents" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(ObjectMeta.class), - @BuildableReference(LabelSelector.class), - @BuildableReference(Container.class), - @BuildableReference(PodTemplateSpec.class), - @BuildableReference(ResourceRequirements.class), - @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), - @BuildableReference(LocalObjectReference.class), - @BuildableReference(PersistentVolumeClaim.class) -}) -@Generated("jsonschema2pojo") -public class UDPRouteStatus implements Editable , KubernetesResource -{ - - @JsonProperty("parents") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List parents = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public UDPRouteStatus() { - } - - public UDPRouteStatus(List parents) { - super(); - this.parents = parents; - } - - @JsonProperty("parents") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getParents() { - return parents; - } - - @JsonProperty("parents") - public void setParents(List parents) { - this.parents = parents; - } - - @JsonIgnore - public UDPRouteStatusBuilder edit() { - return new UDPRouteStatusBuilder(this); - } - - @JsonIgnore - public UDPRouteStatusBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/Gateway.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/Gateway.java index d195cd562ce..15c15343a5f 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/Gateway.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/Gateway.java @@ -18,6 +18,7 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -50,7 +51,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -84,7 +85,7 @@ public class Gateway implements Editable , HasMetadata, Namespac @JsonProperty("kind") private String kind = "Gateway"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private GatewaySpec spec; @JsonProperty("status") @@ -99,7 +100,7 @@ public class Gateway implements Editable , HasMetadata, Namespac public Gateway() { } - public Gateway(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, GatewaySpec spec, GatewayStatus status) { + public Gateway(String apiVersion, String kind, ObjectMeta metadata, GatewaySpec spec, GatewayStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -149,12 +150,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/GatewayClass.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/GatewayClass.java index ca1be65ac2a..e12a1400d84 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/GatewayClass.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/GatewayClass.java @@ -17,6 +17,7 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -49,7 +50,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -83,7 +84,7 @@ public class GatewayClass implements Editable , HasMetadata @JsonProperty("kind") private String kind = "GatewayClass"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private GatewayClassSpec spec; @JsonProperty("status") @@ -98,7 +99,7 @@ public class GatewayClass implements Editable , HasMetadata public GatewayClass() { } - public GatewayClass(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, GatewayClassSpec spec, GatewayClassStatus status) { + public GatewayClass(String apiVersion, String kind, ObjectMeta metadata, GatewayClassSpec spec, GatewayClassStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -148,12 +149,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/HTTPRoute.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/HTTPRoute.java index 2093fc60543..dd4e6e44f85 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/HTTPRoute.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/HTTPRoute.java @@ -18,6 +18,7 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -50,7 +51,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -84,7 +85,7 @@ public class HTTPRoute implements Editable , HasMetadata, Name @JsonProperty("kind") private String kind = "HTTPRoute"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private HTTPRouteSpec spec; @JsonProperty("status") @@ -99,7 +100,7 @@ public class HTTPRoute implements Editable , HasMetadata, Name public HTTPRoute() { } - public HTTPRoute(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, HTTPRouteSpec spec, HTTPRouteStatus status) { + public HTTPRoute(String apiVersion, String kind, ObjectMeta metadata, HTTPRouteSpec spec, HTTPRouteStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -149,12 +150,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/ReferenceGrant.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/ReferenceGrant.java index f970e15e4a5..a9803112aeb 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/ReferenceGrant.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1beta1/ReferenceGrant.java @@ -18,6 +18,7 @@ import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; import io.fabric8.kubernetes.api.model.Namespaced; +import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -47,7 +48,7 @@ "" }) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = { - @BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class), + @BuildableReference(ObjectMeta.class), @BuildableReference(LabelSelector.class), @BuildableReference(Container.class), @BuildableReference(PodTemplateSpec.class), @@ -81,7 +82,7 @@ public class ReferenceGrant implements Editable , HasMeta @JsonProperty("kind") private String kind = "ReferenceGrant"; @JsonProperty("metadata") - private io.fabric8.kubernetes.api.model.ObjectMeta metadata; + private ObjectMeta metadata; @JsonProperty("spec") private ReferenceGrantSpec spec; @JsonIgnore @@ -94,7 +95,7 @@ public class ReferenceGrant implements Editable , HasMeta public ReferenceGrant() { } - public ReferenceGrant(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ReferenceGrantSpec spec) { + public ReferenceGrant(String apiVersion, String kind, ObjectMeta metadata, ReferenceGrantSpec spec) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -143,12 +144,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/ImportManager.java b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/ImportManager.java new file mode 100644 index 00000000000..3eda0013568 --- /dev/null +++ b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/ImportManager.java @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2015 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.fabric8.kubernetes.schema.generator; + +import java.util.Collection; +import java.util.Objects; + +public interface ImportManager { + + String getPackageName(); + + Collection getImports(); + + default void addImport(String importedClass) { + // Only add import if it belongs to a different package + if (!Objects.equals(importedClass.substring(0, importedClass.lastIndexOf('.')), getPackageName())) { + getImports().add(importedClass); + } + } + + default void addAllImports(Collection allImports) { + allImports.forEach(this::addImport); + } + + /** + * Returns true if the given simple class name is already imported (maybe as part of a different package). + * + * @param simpleClassName the simple class name to check. + * @return true if the given simple class name is already imported, false otherwise. + */ + default boolean hasSimpleClassName(String simpleClassName) { + return getImports().stream().anyMatch(i -> i.endsWith("." + simpleClassName)); + } +} diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/ModelGenerator.java b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/ModelGenerator.java index 75284513cfe..a013421820e 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/ModelGenerator.java +++ b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/ModelGenerator.java @@ -50,6 +50,7 @@ import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.getterName; import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.isArray; import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.isMap; +import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.isRef; import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.sanitizeDescription; import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.sanitizeVariable; import static io.fabric8.kubernetes.schema.generator.schema.SchemaUtils.serializerForJavaClass; @@ -125,23 +126,23 @@ private void processTemplate(TemplateContext ret) { } ret.addImport("com.fasterxml.jackson.annotation.JsonInclude"); ret.put("classJsonInclude", "NON_NULL"); - ret.put("className", ret.getClassSimpleName()); - ret.put("implementedInterfaces", resolveImplementedInterfaces(ret)); - final List> templateFields = templateFields(ret); - ret.put("fields", templateFields); - if (!templateFields.isEmpty()) { - ret.put("hasFields", true); - ret.addImport("com.fasterxml.jackson.annotation.JsonProperty"); - } ret.put("propertyOrder", SchemaUtils.propertyOrder(ret.getClassSchema())); ret.put("builderPackage", settings.getBuilderPackage()); if (settings.isAddBuildableReferences()) { ret.put("buildable", false); ret.addImport("io.sundr.builder.annotations.BuildableReference"); - ret.put("buildableReferences", buildableReferences(ret, templateFields)); + ret.put("buildableReferences", buildableReferences(ret)); } else { ret.put("buildable", true); } + ret.put("className", ret.getClassSimpleName()); + ret.put("implementedInterfaces", resolveImplementedInterfaces(ret)); + final List> templateFields = templateFields(ret); + ret.put("fields", templateFields); + if (!templateFields.isEmpty()) { + ret.put("hasFields", true); + ret.addImport("com.fasterxml.jackson.annotation.JsonProperty"); + } if (!ret.getSchemaProperties().containsKey("additionalProperties")) { ret.put("additionalProperties", true); ret.addImport("com.fasterxml.jackson.annotation.JsonAnyGetter"); @@ -155,7 +156,7 @@ private List> templateFields(TemplateContext templateContext final Map templateProp = new HashMap<>(); final Schema propertySchema = property.getValue(); properties.add(templateProp); - final String type = utils.schemaToClassName(templateContext::addImport, propertySchema); + final String type = utils.schemaToClassName(templateContext, propertySchema); templateProp.put("propertyName", property.getKey()); templateProp.put("type", type); templateProp.put("name", sanitizeVariable(property.getKey())); @@ -265,17 +266,26 @@ private String resolveImplementedInterfaces(TemplateContext templateContext) { return implementedInterfaces.toString(); } - private Map> buildableReferences(TemplateContext templateContext, List> fields) { + private Map> buildableReferences(TemplateContext templateContext) { final List references = new ArrayList<>(settings.getBuildableReferences()); references.add(0, settings.getObjectMetaClass()); - if (fields.stream().map(f -> f.get("type")).filter(Objects::nonNull).map(Object::toString) - .anyMatch(r -> r.contains("KubernetesResource") || r.contains("HasMetadata") || r.contains("RawExtension"))) { + if (templateContext.getSchemaProperties().values().stream() + .filter(s -> !isMap(s)) + .filter(s -> !isArray(s)) + .filter(s -> !isRef(s)) + .anyMatch(SchemaUtils::isObject)) { references.add(settings.getGenericKubernetesResourceClass()); references.add(settings.getRawExtensionClass()); } - references.forEach(templateContext::addImport); return Collections.singletonMap("refs", references.stream() - .map(r -> r.substring(r.lastIndexOf('.') + 1)) + .map(r -> { + final String referenceSimpleClass = r.substring(r.lastIndexOf('.') + 1); + if (templateContext.getClassSimpleName().equals(referenceSimpleClass)) { + return r; + } + templateContext.addImport(r); + return referenceSimpleClass; + }) .map(ref -> ref.concat(".class")).collect(Collectors.toList())); } diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/TemplateContext.java b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/TemplateContext.java index 96bb64d0d8a..58933d24449 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/TemplateContext.java +++ b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/model/TemplateContext.java @@ -17,40 +17,30 @@ import io.fabric8.kubernetes.schema.generator.ApiVersion; import io.fabric8.kubernetes.schema.generator.GeneratorSettings; +import io.fabric8.kubernetes.schema.generator.ImportManager; import io.fabric8.kubernetes.schema.generator.ImportOrderComparator; import io.fabric8.kubernetes.schema.generator.schema.SchemaUtils; import io.swagger.v3.oas.models.media.Schema; import lombok.Getter; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.TreeSet; -final class TemplateContext { +@Getter +final class TemplateContext implements ImportManager { - @Getter private final String classKey; - @Getter private final Schema classSchema; - @Getter private final ApiVersion apiVersion; - @Getter private final String packageName; - @Getter private final boolean inRootPackage; - @Getter private final String classSimpleName; - @Getter private final String className; - @Getter private final boolean hasMetadata; - @Getter private final String kubernetesListType; - @Getter private final Map context; private final Set imports; @@ -64,7 +54,7 @@ final class TemplateContext { classSimpleName = SchemaUtils.refToClassName(classKey); className = packageName + "." + classSimpleName; imports = new TreeSet<>(new ImportOrderComparator()); - kubernetesListType = apiVersion == null ? null : schemaUtils.kubernetesListType(this::addImport, classSchema); + kubernetesListType = apiVersion == null ? null : schemaUtils.kubernetesListType(this, classSchema); hasMetadata = apiVersion != null && kubernetesListType == null && schemaUtils.isHasMetadata(classSchema); context = new HashMap<>(); context.put("imports", imports); @@ -74,17 +64,6 @@ void put(String key, Object value) { context.put(key, value); } - void addImport(String importedClass) { - // Only add import if it belongs to a different package - if (!Objects.equals(importedClass.substring(0, importedClass.lastIndexOf('.')), packageName)) { - imports.add(importedClass); - } - } - - void addAllImports(Collection allImports) { - allImports.forEach(this::addImport); - } - Map getSchemaProperties() { return classSchema.getProperties() == null ? Collections.emptyMap() : classSchema.getProperties(); } diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/schema/SchemaUtils.java b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/schema/SchemaUtils.java index 2a7e3d6cc91..1e5c12d7a90 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/schema/SchemaUtils.java +++ b/kubernetes-model-generator/openapi/maven-plugin/src/main/java/io/fabric8/kubernetes/schema/generator/schema/SchemaUtils.java @@ -17,6 +17,7 @@ package io.fabric8.kubernetes.schema.generator.schema; import io.fabric8.kubernetes.schema.generator.GeneratorSettings; +import io.fabric8.kubernetes.schema.generator.ImportManager; import io.fabric8.kubernetes.schema.generator.PropertyOrderComparator; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; @@ -42,7 +43,6 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.function.Consumer; import java.util.stream.Collectors; public class SchemaUtils { @@ -145,6 +145,12 @@ public SchemaUtils(GeneratorSettings settings) { this.settings = settings; } + /** + * Returns the simple class name associated to the provided Schema reference. + * + * @param ref the reference to extract the class name from. + * @return the simple class name associated to the provided Schema reference. + */ public static String refToClassName(String ref) { return capitalize(ref.substring(ref.lastIndexOf('.') + 1)); } @@ -168,22 +174,21 @@ public String toModelPackage(String packageName) { * Returns the mapped Class name associated to the provided {@link Schema} and adds * an import to the canonical path of the class represented by that name if necessary. * - * @param addImport function to add an import that might be needed for the referneced class. + * @param imports import manager to add an import to the class in case it's necessary. * @param schema the schema from which to retrieve the mapped Class name. * @return String containing the Class name mapped to the provided Schema. */ - public String schemaToClassName(Consumer addImport, Schema schema) { - final String ref = schema.get$ref(); + public String schemaToClassName(ImportManager imports, Schema schema) { if (isArray(schema)) { final ArraySchema arraySchema = (ArraySchema) schema; - addImport.accept("java.util.List"); - return String.format("List<%s>", schemaToClassName(addImport, arraySchema.getItems())); + imports.addImport("java.util.List"); + return String.format("List<%s>", schemaToClassName(imports, arraySchema.getItems())); } if (isMap(schema)) { - addImport.accept("java.util.Map"); + imports.addImport("java.util.Map"); final String valueType; if (schema.getAdditionalProperties() instanceof Schema) { - valueType = schemaToClassName(addImport, (Schema) schema.getAdditionalProperties()); + valueType = schemaToClassName(imports, (Schema) schema.getAdditionalProperties()); } else { valueType = "Object"; } @@ -198,22 +203,27 @@ public String schemaToClassName(Consumer addImport, Schema schema) { if (isString(schema)) { return "String"; } - if (ref != null && !ref.trim().isEmpty()) { + if (isRef(schema)) { + final String ref = schema.get$ref(); final Optional javaPrimitive = schemaRefToJavaPrimitive(schema); if (javaPrimitive.isPresent()) { return javaPrimitive.get(); } final Optional javaType = schemaRefToJavaType(schema); if (javaType.isPresent()) { - addImport.accept(javaType.get()); + imports.addImport(javaType.get()); return javaType.get().substring(javaType.get().lastIndexOf('.') + 1); } - addImport.accept(refToModelPackage(ref)); - return refToClassName(ref); + if (imports.hasSimpleClassName(refToClassName(ref))) { + return refToModelPackage(ref); + } else { + imports.addImport(refToModelPackage(ref)); + return refToClassName(ref); + } } // Plain OpenAPI object map to KubernetesResource (deserializer will take care of the rest) if (isObject(schema)) { - addImport.accept(settings.getKubernetesResourceClass()); + imports.addImport(settings.getKubernetesResourceClass()); return settings.getKubernetesResourceClassSimpleName(); } return schemaTypeToJavaPrimitive(schema); @@ -255,7 +265,11 @@ public static boolean isMap(Schema schema) { return false; } - private static boolean isObject(Schema schema) { + public static boolean isRef(Schema schema) { + return schema != null && schema.get$ref() != null && !schema.get$ref().trim().isEmpty(); + } + + public static boolean isObject(Schema schema) { return Optional.ofNullable(schema.getType()).orElse("").equals("object"); } @@ -280,7 +294,7 @@ public boolean isRefInstanceOf(String ref, Class clazz) { .anyMatch(entry -> ref.endsWith(entry.getKey())); } - public String kubernetesListType(Consumer addImport, Schema schema) { + public String kubernetesListType(ImportManager imports, Schema schema) { if (schema == null || !isObject(schema)) { return null; } @@ -288,7 +302,7 @@ public String kubernetesListType(Consumer addImport, Schema schema) { .map(p -> p.get("items")) .filter(s -> s instanceof ArraySchema) .map(s -> (ArraySchema) s) - .map(as -> schemaToClassName(addImport, as.getItems())) + .map(as -> schemaToClassName(imports, as.getItems())) .orElse(null); } diff --git a/kubernetes-model-generator/openapi/maven-plugin/src/test/java/io/fabric8/kubernetes/schema/generator/SchemaUtilsTest.java b/kubernetes-model-generator/openapi/maven-plugin/src/test/java/io/fabric8/kubernetes/schema/generator/SchemaUtilsTest.java index 18678465c66..a96311a00e3 100644 --- a/kubernetes-model-generator/openapi/maven-plugin/src/test/java/io/fabric8/kubernetes/schema/generator/SchemaUtilsTest.java +++ b/kubernetes-model-generator/openapi/maven-plugin/src/test/java/io/fabric8/kubernetes/schema/generator/SchemaUtilsTest.java @@ -33,13 +33,13 @@ import java.io.File; import java.util.Arrays; +import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Consumer; +import java.util.TreeSet; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; class SchemaUtilsTest { @@ -132,8 +132,7 @@ void serializerForJavaClass(String javaClass, String expected) { class SchemaToClassName { private SchemaUtils schemaUtils; - private AtomicReference addImport; - private Consumer importConsumer; + private ImportManager importManager; @BeforeEach void setUp() { @@ -142,50 +141,61 @@ void setUp() { "io.k8s.api.core.v1", "io.fabric8.kubernetes.api.model") .packageMapping("io.k8s.apimachinery.pkg.apis.meta.v1", "io.fabric8.kubernetes.api.model") .build()); - addImport = new AtomicReference<>(); - importConsumer = addImport::set; + importManager = new ImportManager() { + private final Collection imports = new TreeSet<>(new ImportOrderComparator()); + + @Override + public String getPackageName() { + return ""; + } + + @Override + public Collection getImports() { + return imports; + } + }; } @Test void arrays() { final ArraySchema schema = new ArraySchema(); schema.items(new StringSchema()); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("List", result); - assertEquals("java.util.List", addImport.get()); + assertEquals("java.util.List", importManager.getImports().iterator().next()); } @Test void mapOfObjects() { final MapSchema schema = new MapSchema(); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("Map", result); - assertEquals("java.util.Map", addImport.get()); + assertEquals("java.util.Map", importManager.getImports().iterator().next()); } @Test void mapOfIntegers() { final MapSchema schema = new MapSchema(); schema.additionalProperties(new IntegerSchema()); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("Map", result); - assertEquals("java.util.Map", addImport.get()); + assertEquals("java.util.Map", importManager.getImports().iterator().next()); } @Test void date() { final DateSchema schema = new DateSchema(); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("String", result); - assertNull(addImport.get()); + assertTrue(importManager.getImports().isEmpty()); } @Test void dateTime() { final DateTimeSchema schema = new DateTimeSchema(); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("String", result); - assertNull(addImport.get()); + assertTrue(importManager.getImports().isEmpty()); } @Test @@ -195,78 +205,95 @@ void dateTime() { void microTime() { final ObjectSchema schema = new ObjectSchema(); schema.set$ref("#/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.MicroTime"); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("MicroTime", result); - assertEquals("io.fabric8.kubernetes.api.model.MicroTime", addImport.get()); + assertEquals("io.fabric8.kubernetes.api.model.MicroTime", importManager.getImports().iterator().next()); } @Test void string() { final StringSchema schema = new StringSchema(); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("String", result); - assertNull(addImport.get()); + assertTrue(importManager.getImports().isEmpty()); } @Test void integer() { final IntegerSchema schema = new IntegerSchema(); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("Integer", result); - assertNull(addImport.get()); + assertTrue(importManager.getImports().isEmpty()); } @Test void _long() { final NumberSchema schema = new NumberSchema(); schema.setFormat("int64"); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("Long", result); - assertNull(addImport.get()); + assertTrue(importManager.getImports().isEmpty()); } @Test void _double() { final NumberSchema schema = new NumberSchema(); schema.setFormat("double"); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("Double", result); - assertNull(addImport.get()); + assertTrue(importManager.getImports().isEmpty()); } - @Test - void ref() { - final ObjectSchema schema = new ObjectSchema(); - schema.set$ref("#/definitions/io.k8s.api.core.v1.Pod"); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); - assertEquals("Pod", result); - assertEquals("io.fabric8.kubernetes.api.model.Pod", addImport.get()); + @Nested + class Ref { + + @Test + void ref() { + final ObjectSchema schema = new ObjectSchema(); + schema.set$ref("#/definitions/io.k8s.api.core.v1.Pod"); + final String result = schemaUtils.schemaToClassName(importManager, schema); + assertEquals("Pod", result); + assertEquals("io.fabric8.kubernetes.api.model.Pod", importManager.getImports().iterator().next()); + } + + @Test + void refWithCollidingImport() { + // Colliding import + importManager.addImport("io.fabric8.kubernetes.api.model.ObjectReference"); + final ObjectSchema schema = new ObjectSchema(); + schema.set$ref("#/definitions/io.fabric8.kubernetes.api.model.gatewayapi.v1.ObjectReference"); + final String result = schemaUtils.schemaToClassName(importManager, schema); + assertEquals("io.fabric8.kubernetes.api.model.gatewayapi.v1.ObjectReference", result); + assertEquals(1, importManager.getImports().size()); + assertEquals("io.fabric8.kubernetes.api.model.ObjectReference", importManager.getImports().iterator().next()); + } + } @Test void intOrString() { final ObjectSchema schema = new ObjectSchema(); schema.set$ref("#/components/schemas/io.k8s.apimachinery.pkg.util.intstr.IntOrString"); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("IntOrString", result); - assertEquals("io.fabric8.kubernetes.api.model.IntOrString", addImport.get()); + assertEquals("io.fabric8.kubernetes.api.model.IntOrString", importManager.getImports().iterator().next()); } @Test void jsonNode() { final ObjectSchema schema = new ObjectSchema(); schema.set$ref("#/components/schemas/io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.JSON"); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("JsonNode", result); - assertEquals("com.fasterxml.jackson.databind.JsonNode", addImport.get()); + assertEquals("com.fasterxml.jackson.databind.JsonNode", importManager.getImports().iterator().next()); } @Test void plainObject() { final ObjectSchema schema = new ObjectSchema(); - final String result = schemaUtils.schemaToClassName(importConsumer, schema); + final String result = schemaUtils.schemaToClassName(importManager, schema); assertEquals("KubernetesResource", result); - assertEquals("io.fabric8.kubernetes.api.model.KubernetesResource", addImport.get()); + assertEquals("io.fabric8.kubernetes.api.model.KubernetesResource", importManager.getImports().iterator().next()); } }