From 2a5ff166e09086eaf484d71e9fc22d17f962c0f5 Mon Sep 17 00:00:00 2001 From: nanashi0x74 Date: Mon, 25 Jan 2021 21:31:02 +0100 Subject: [PATCH 1/3] add getters for default headermap and auths --- .../src/main/resources/dart2/api_client.mustache | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/dart2/api_client.mustache b/modules/openapi-generator/src/main/resources/dart2/api_client.mustache index e6e6b07771ca..09edf0a8273b 100644 --- a/modules/openapi-generator/src/main/resources/dart2/api_client.mustache +++ b/modules/openapi-generator/src/main/resources/dart2/api_client.mustache @@ -49,6 +49,12 @@ class ApiClient { _defaultHeaderMap[key] = value; } + Map get defaultHeaderMap => _defaultHeaderMap; + /// returns an unmodifiable view of the authentications, since none should be added + /// nor deleted + Map get authentications => + Map.unmodififiable(_authentications); + dynamic deserialize(String json, String targetType, {bool growable}) { // Remove all spaces. Necessary for reg expressions as well. targetType = targetType.replaceAll(' ', ''); From ec60f603598abf0f57dfdb6ca55b4d5c1ee25edf Mon Sep 17 00:00:00 2001 From: nanashi0x74 Date: Mon, 25 Jan 2021 22:01:37 +0100 Subject: [PATCH 2/3] regenerate samples, make shebangs portable --- bin/utils/export_docs_generators.sh | 4 ++-- bin/utils/export_generator.sh | 2 +- .../petstore/dart2/petstore_client_lib/lib/api_client.dart | 6 ++++++ .../petstore/dart2/petstore_client_lib/lib/api_client.dart | 6 ++++++ .../dart2/petstore_client_lib_fake/lib/api_client.dart | 6 ++++++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/bin/utils/export_docs_generators.sh b/bin/utils/export_docs_generators.sh index a456f275f8f3..6417629c7d8f 100755 --- a/bin/utils/export_docs_generators.sh +++ b/bin/utils/export_docs_generators.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash SCRIPT="$0" echo "# START SCRIPT: ${SCRIPT}" @@ -17,4 +17,4 @@ do ((i=i%N)); ((i++==0)) && wait ./bin/utils/export_generator.sh ${GENERATOR} & done -) \ No newline at end of file +) diff --git a/bin/utils/export_generator.sh b/bin/utils/export_generator.sh index a566522a90b8..8a54d77555a5 100755 --- a/bin/utils/export_generator.sh +++ b/bin/utils/export_generator.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash SCRIPT="$0" diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart index 79394cc83357..e9fe382f91a6 100644 --- a/samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart +++ b/samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart @@ -42,6 +42,12 @@ class ApiClient { _defaultHeaderMap[key] = value; } + Map get defaultHeaderMap => _defaultHeaderMap; + /// returns an unmodifiable view of the authentications, since none should be added + /// nor deleted + Map get authentications => + Map.unmodififiable(_authentications); + dynamic deserialize(String json, String targetType, {bool growable}) { // Remove all spaces. Necessary for reg expressions as well. targetType = targetType.replaceAll(' ', ''); diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart index 79394cc83357..e9fe382f91a6 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart +++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart @@ -42,6 +42,12 @@ class ApiClient { _defaultHeaderMap[key] = value; } + Map get defaultHeaderMap => _defaultHeaderMap; + /// returns an unmodifiable view of the authentications, since none should be added + /// nor deleted + Map get authentications => + Map.unmodififiable(_authentications); + dynamic deserialize(String json, String targetType, {bool growable}) { // Remove all spaces. Necessary for reg expressions as well. targetType = targetType.replaceAll(' ', ''); diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart index 22d45db938dd..ef906459652e 100644 --- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart +++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart @@ -45,6 +45,12 @@ class ApiClient { _defaultHeaderMap[key] = value; } + Map get defaultHeaderMap => _defaultHeaderMap; + /// returns an unmodifiable view of the authentications, since none should be added + /// nor deleted + Map get authentications => + Map.unmodififiable(_authentications); + dynamic deserialize(String json, String targetType, {bool growable}) { // Remove all spaces. Necessary for reg expressions as well. targetType = targetType.replaceAll(' ', ''); From ec6a217e531104cdd036e12cd37be018bdfdfbb4 Mon Sep 17 00:00:00 2001 From: nanashi0x74 Date: Wed, 27 Jan 2021 20:21:33 +0100 Subject: [PATCH 3/3] Revert making shebangs portable This reverts commit ec60f603598abf0f57dfdb6ca55b4d5c1ee25edf. --- bin/utils/export_docs_generators.sh | 4 ++-- bin/utils/export_generator.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/utils/export_docs_generators.sh b/bin/utils/export_docs_generators.sh index 6417629c7d8f..a456f275f8f3 100755 --- a/bin/utils/export_docs_generators.sh +++ b/bin/utils/export_docs_generators.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCRIPT="$0" echo "# START SCRIPT: ${SCRIPT}" @@ -17,4 +17,4 @@ do ((i=i%N)); ((i++==0)) && wait ./bin/utils/export_generator.sh ${GENERATOR} & done -) +) \ No newline at end of file diff --git a/bin/utils/export_generator.sh b/bin/utils/export_generator.sh index 8a54d77555a5..a566522a90b8 100755 --- a/bin/utils/export_generator.sh +++ b/bin/utils/export_generator.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash SCRIPT="$0"