diff --git a/openapi/java.sh b/openapi/java.sh index c85b551..e67a688 100755 --- a/openapi/java.sh +++ b/openapi/java.sh @@ -49,5 +49,5 @@ source "${SETTING_FILE}" SWAGGER_CODEGEN_COMMIT=5d263e1c9cdd395d93adf061c63d5ef58a8e9ec5; \ CLIENT_LANGUAGE=java; \ -CLEANUP_DIRS=(docs src/test src/main/java/io/kubernetes/client/apis src/main/java/io/kubernetes/client/models src/main/java/io/kubernetes/client/auth gradle); \ +CLEANUP_DIRS=(docs src/test/java/io/kubernetes/client/apis src/main/java/io/kubernetes/client/apis src/main/java/io/kubernetes/client/models src/main/java/io/kubernetes/client/auth gradle); \ kubeclient::generator::generate_client "${OUTPUT_DIR}" diff --git a/openapi/java.xml b/openapi/java.xml index ac590fd..0d5b2cc 100644 --- a/openapi/java.xml +++ b/openapi/java.xml @@ -45,8 +45,8 @@ joda false okhttp-gson - intstr.IntOrString=IntOrString - IntOrString=io.kubernetes.client.custom.IntOrString + intstr.IntOrString=IntOrString,resource.Quantity=Quantity + IntOrString=io.kubernetes.client.custom.IntOrString,Quantity=io.kubernetes.client.custom.Quantity ${generator.output.path} diff --git a/openapi/preprocess_spec.py b/openapi/preprocess_spec.py index 19ade64..a0e70bd 100644 --- a/openapi/preprocess_spec.py +++ b/openapi/preprocess_spec.py @@ -133,7 +133,7 @@ def process_swagger(spec, client_language): def preserved_primitives_for_language(client_language): if client_language == "java": - return ["intstr.IntOrString"] + return ["intstr.IntOrString", "resource.Quantity"] else: return []