Merge branch 'master' into feature/fix-issue-9685

wangYX657211334 · Oct 3, 2019 · 781ee9a · 781ee9a
2 parents 8bccfea + c9252e8
commit 781ee9a
Show file tree

Hide file tree

Showing 31 changed files with 1,016 additions and 722 deletions.
diff --git a/bin/windows/nodejs-server-petstore.bat b/bin/windows/nodejs-server-petstore.bat
@@ -0,0 +1,10 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
+set ags=generate  --artifact-id "nodejs-petstore-server" -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l nodejs-server -o samples\server\petstore\nodejs
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
@@ -98,8 +98,8 @@ public AbstractJavaCodegen() {
         modelDocTemplateFiles.put("model_doc.mustache", ".md");
         apiDocTemplateFiles.put("api_doc.mustache", ".md");
 
-        hideGenerationTimestamp = false; 
-        
+        hideGenerationTimestamp = false;
+
         setReservedWordsLowerCase(
             Arrays.asList(
                 // used as internal variables, can collide with parameter names
@@ -167,6 +167,7 @@ public AbstractJavaCodegen() {
         dateOptions.put("java8", "Java 8 native JSR310 (preferred for jdk 1.8+) - note: this also sets \"" + JAVA8_MODE + "\" to true");
         dateOptions.put("threetenbp", "Backport of JSR310 (preferred for jdk < 1.8)");
         dateOptions.put("java8-localdatetime", "Java 8 using LocalDateTime (for legacy app only)");
+        dateOptions.put("java8-instant", "Java 8 using Instant");
         dateOptions.put("joda", "Joda (for legacy app only)");
         dateOptions.put("legacy", "Legacy java.util.Date (if you really have a good reason not to use threetenbp");
         dateLibrary.setEnum(dateOptions);
@@ -440,13 +441,19 @@ public void processOpts() {
         } else if (dateLibrary.startsWith("java8")) {
             additionalProperties.put("java8", "true");
             additionalProperties.put("jsr310", "true");
-            typeMapping.put("date", "LocalDate");
-            importMapping.put("LocalDate", "java.time.LocalDate");
             if ("java8-localdatetime".equals(dateLibrary)) {
+                typeMapping.put("date", "LocalDate");
                 typeMapping.put("DateTime", "LocalDateTime");
+                importMapping.put("LocalDate", "java.time.LocalDate");
                 importMapping.put("LocalDateTime", "java.time.LocalDateTime");
+            } else if ("java8-instant".equals(dateLibrary)) {
+                typeMapping.put("date", "Instant");
+                typeMapping.put("DateTime", "Instant");
+                importMapping.put("Instant", "java.time.Instant");
             } else {
+                typeMapping.put("date", "LocalDate");
                 typeMapping.put("DateTime", "OffsetDateTime");
+                importMapping.put("LocalDate", "java.time.LocalDate");
                 importMapping.put("OffsetDateTime", "java.time.OffsetDateTime");
             }
         } else if (dateLibrary.equals("legacy")) {

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java
@@ -158,9 +158,13 @@ public String apiFilename(String templateName, String tag) {
         String result = super.apiFilename(templateName, tag);
 
         if (templateName.equals("service.mustache")) {
-            String stringToMatch = File.separator + "controllers" + File.separator;
-            String replacement = File.separator + implFolder + File.separator;
-            result = result.replaceAll(Pattern.quote(stringToMatch), replacement);
+            String regexFileSep = File.separator;
+            if (regexFileSep.equals("\\")) {
+                regexFileSep = "\\\\";
+            }
+            String stringToMatch = regexFileSep + "controllers" + regexFileSep;
+            String replacement = regexFileSep + implFolder + regexFileSep;
+            result = result.replaceAll(stringToMatch, replacement);
         }
         return result;
     }

diff --git a/modules/swagger-codegen/src/main/resources/swift4/CodableHelper.mustache b/modules/swagger-codegen/src/main/resources/swift4/CodableHelper.mustache
@@ -9,6 +9,10 @@ import Foundation
 
 public typealias EncodeResult = (data: Data?, error: Error?)
 
+enum DateError: String, Error {
+    case invalidDate
+}
+
 open class CodableHelper {
 
     open static var dateformatter: DateFormatter?
@@ -18,16 +22,39 @@ open class CodableHelper {
         var returnedError: Error? = nil
 
         let decoder = JSONDecoder()
+
         if let df = self.dateformatter {
             decoder.dateDecodingStrategy = .formatted(df)
         } else {
             decoder.dataDecodingStrategy = .base64
-            let formatter = DateFormatter()
-            formatter.calendar = Calendar(identifier: .iso8601)
-            formatter.locale = Locale(identifier: "en_US_POSIX")
-            formatter.timeZone = TimeZone(secondsFromGMT: 0)
-            formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXXX"
-            decoder.dateDecodingStrategy = .formatted(formatter)
+            decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
+                let container = try decoder.singleValueContainer()
+                let dateStr = try container.decode(String.self)
+
+                let formatters = [
+                    "yyyy-MM-dd",
+                    "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
+                    "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ",
+                    "yyyy-MM-dd'T'HH:mm:ss'Z'",
+                    "yyyy-MM-dd'T'HH:mm:ss.SSS",
+                    "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
+                    "yyyy-MM-dd HH:mm:ss"
+                    ].map { (format: String) -> DateFormatter in
+                        let formatter = DateFormatter()
+                        formatter.locale = Locale(identifier: "en_US_POSIX")
+                        formatter.dateFormat = format
+                        return formatter
+                }
+
+                for formatter in formatters {
+
+                    if let date = formatter.date(from: dateStr) {
+                        return date
+                    }
+                }
+
+                throw DateError.invalidDate
+            })
         }
 
         do {

diff --git a/samples/client/petstore-security-test/swift/.swagger-codegen/VERSION b/samples/client/petstore-security-test/swift/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
+2.4.9-SNAPSHOT
diff --git a/samples/client/petstore/swift4/default/.swagger-codegen/VERSION b/samples/client/petstore/swift4/default/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.3-SNAPSHOT
+2.4.9-SNAPSHOT
diff --git a/...etstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/FakeClassnameTags123API.swift b/...etstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/FakeClassnameTags123API.swift
@@ -45,8 +45,7 @@ open class FakeClassnameTags123API {
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
 
         var url = URLComponents(string: URLString)
-        url?.queryItems = APIHelper.mapValuesToQueryItems([
-        ])
+        url?.queryItems = APIHelper.mapValuesToQueryItems([:])
 
         let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 

diff --git a/...nt/petstore/swift4/default/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift b/...nt/petstore/swift4/default/PetstoreClient/Classes/Swaggers/AlamofireImplementations.swift
@@ -20,6 +20,9 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
 // Store manager to retain its reference
 private var managerStore: [String: Alamofire.SessionManager] = [:]
 
+// Sync queue to manage safe access to the store manager
+private let syncQueue = DispatchQueue(label: "thread-safe-sync-queue", attributes: .concurrent)
+
 open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
     required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
@@ -58,7 +61,9 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         let managerId:String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let manager = createSessionManager()
-        managerStore[managerId] = manager
+        syncQueue.async(flags: .barrier) {
+            managerStore[managerId] = manager
+        }
 
         let encoding:ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
 
@@ -112,7 +117,9 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         }
 
         let cleanupRequest = {
-            _ = managerStore.removeValue(forKey: managerId)
+            syncQueue.async(flags: .barrier) {
+                 _ = managerStore.removeValue(forKey: managerId)
+            }
         }
 
         let validatedRequest = request.validate()
@@ -314,7 +321,9 @@ open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilde
         }
 
         let cleanupRequest = {
-            _ = managerStore.removeValue(forKey: managerId)
+            syncQueue.async(flags: .barrier) {
+                _ = managerStore.removeValue(forKey: managerId)
+            }
         }
 
         let validatedRequest = request.validate()

diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/CodableHelper.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/CodableHelper.swift
@@ -9,6 +9,10 @@ import Foundation
 
 public typealias EncodeResult = (data: Data?, error: Error?)
 
+enum DateError: String, Error {
+    case invalidDate
+}
+
 open class CodableHelper {
 
     open static var dateformatter: DateFormatter?
@@ -18,16 +22,39 @@ open class CodableHelper {
         var returnedError: Error? = nil
 
         let decoder = JSONDecoder()
+
         if let df = self.dateformatter {
             decoder.dateDecodingStrategy = .formatted(df)
         } else {
             decoder.dataDecodingStrategy = .base64
-            let formatter = DateFormatter()
-            formatter.calendar = Calendar(identifier: .iso8601)
-            formatter.locale = Locale(identifier: "en_US_POSIX")
-            formatter.timeZone = TimeZone(secondsFromGMT: 0)
-            formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXXX"
-            decoder.dateDecodingStrategy = .formatted(formatter)
+            decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
+                let container = try decoder.singleValueContainer()
+                let dateStr = try container.decode(String.self)
+
+                let formatters = [
+                    "yyyy-MM-dd",
+                    "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
+                    "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ",
+                    "yyyy-MM-dd'T'HH:mm:ss'Z'",
+                    "yyyy-MM-dd'T'HH:mm:ss.SSS",
+                    "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
+                    "yyyy-MM-dd HH:mm:ss"
+                    ].map { (format: String) -> DateFormatter in
+                        let formatter = DateFormatter()
+                        formatter.locale = Locale(identifier: "en_US_POSIX")
+                        formatter.dateFormat = format
+                        return formatter
+                }
+
+                for formatter in formatters {
+
+                    if let date = formatter.date(from: dateStr) {
+                        return date
+                    }
+                }
+
+                throw DateError.invalidDate
+            })
         }
 
         do {

diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Podfile b/samples/client/petstore/swift4/default/SwaggerClientTests/Podfile
@@ -12,7 +12,7 @@ end
 post_install do |installer|
     installer.pods_project.targets.each do |target|
         target.build_configurations.each do |configuration|
-            configuration.build_settings['SWIFT_VERSION'] = "3.0"
+            configuration.build_settings['SWIFT_VERSION'] = "4.2"
         end
     end
 end
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Podfile.lock b/samples/client/petstore/swift4/default/SwaggerClientTests/Podfile.lock
@@ -6,14 +6,18 @@ PODS:
 DEPENDENCIES:
   - PetstoreClient (from `../`)
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - Alamofire
+
 EXTERNAL SOURCES:
   PetstoreClient:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   Alamofire: f28cdffd29de33a7bfa022cbd63ae95a27fae140
-  PetstoreClient: fef7934ac90bd28c2b81cc5234615112f9ace5f5
+  PetstoreClient: 9f1c86c3f7194758e922fb64277bfb4fc60bbf20
 
-PODFILE CHECKSUM: 417049e9ed0e4680602b34d838294778389bd418
+PODFILE CHECKSUM: 065fc3a3ec186d4f60ef8c7d9624786f07955f2f
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.7.1
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Manifest.lock b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Manifest.lock