Merge pull request #1223 from swagger-api/v2-changes-porting

V2 changes porting
swagger-api · Dec 1, 2023 · b52a470 · b52a470
2 parents a0a349a + e3cc21e
commit b52a470
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/src/main/resources/handlebars/JavaJaxRS/apiServiceImpl.mustache b/src/main/resources/handlebars/JavaJaxRS/apiServiceImpl.mustache
@@ -24,7 +24,7 @@ import javax.ws.rs.core.SecurityContext;
 {{/jakarta}}
 {{#useBeanValidation}}
 {{#jakarta}}
-import javax.validation.constraints.*;
+import jakarta.validation.constraints.*;
 {{/jakarta}}
 {{^jakarta}}
 import javax.validation.constraints.*;

diff --git a/src/main/resources/handlebars/JavaVertXServer/model.mustache b/src/main/resources/handlebars/JavaVertXServer/model.mustache
@@ -9,8 +9,8 @@ import java.io.Serializable;
 {{/serializableModel}}
 {{#useBeanValidation}}
 {{#jakarta}}
-import javax.validation.constraints.*;
-import javax.validation.Valid;
+import jakarta.validation.constraints.*;
+import jakarta.validation.Valid;
 {{/jakarta}}
 {{^jakarta}}
 import javax.validation.constraints.*;

diff --git a/src/main/resources/handlebars/python/configuration.mustache b/src/main/resources/handlebars/python/configuration.mustache
@@ -215,9 +215,12 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
 
         :return: The token for basic HTTP authentication.
         """
-        return urllib3.util.make_headers(
-            basic_auth=self.username + ':' + self.password
-        ).get('authorization')
+        token = ""
+        if self.username or self.password:
+            token = urllib3.util.make_headers(
+                basic_auth=self.username + ':' + self.password
+            ).get('authorization')
+        return token
 
     def auth_settings(self):
         """Gets Auth Settings dict for api client.

diff --git a/src/main/resources/handlebars/python/rest.mustache b/src/main/resources/handlebars/python/rest.mustache
@@ -34,11 +34,11 @@ class RESTResponse(io.IOBase):
 
     def getheaders(self):
         """Returns a dictionary of the response headers."""
-        return self.urllib3_response.getheaders()
+        return self.urllib3_response.headers
 
     def getheader(self, name, default=None):
         """Returns a given response header."""
-        return self.urllib3_response.getheader(name, default)
+        return self.urllib3_response.headers.get(name, default)
 
 
 class RESTClientObject(object):

diff --git a/src/main/resources/handlebars/typescript-fetch/api.mustache b/src/main/resources/handlebars/typescript-fetch/api.mustache
@@ -61,7 +61,7 @@ export class BaseAPI {
  * @extends {Error}
  */
 export class RequiredError extends Error {
-    name: "RequiredError"
+    name = "RequiredError"
     constructor(public field: string, msg?: string) {
         super(msg);
     }