Merge branch 'master' into typescript-date-format

Author: tsiq-jeremy

modules/swagger-codegen/src/main/resources/swift4/AlamofireImplementations.mustache

@@ -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()

modules/swagger-codegen/src/test/java/io/swagger/codegen/ignore/CodegenIgnoreProcessorTest.java

@@ -12,6 +12,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 public class CodegenIgnoreProcessorTest {
 
@@ -25,6 +26,7 @@ public class CodegenIgnoreProcessorTest {
     private String outputDir;
     private File target;
     private Path temp;
+    private static final ConcurrentLinkedQueue<Path> tempQueue = new ConcurrentLinkedQueue<>();
 
     private CodegenIgnoreProcessorTest(String filename, String ignoreDefinition, String description) throws IOException {
         this.filename = filename;
@@ -51,6 +53,7 @@ private void prepareTestFiles() throws IOException {
         // NOTE: Each test needs its own directory because .swagger-codegen-ignore needs to exist at the root.
         temp = Files.createTempDirectory(getClass().getSimpleName());
         this.outputDir = temp.toFile().getAbsolutePath();
+        tempQueue.add(temp);
 
         target = new File(this.outputDir, this.filename);
 
@@ -73,9 +76,11 @@ private void prepareTestFiles() throws IOException {
 
     @AfterTest
     public void afterTest() throws IOException {
-        if(temp != null && temp.toFile().exists() && temp.toFile().isDirectory()) {
-            FileUtils.deleteDirectory(temp.toFile());
-        }
+        Path t;
+        while ((t = tempQueue.poll()) != null)
+            if(t != null && t.toFile().exists() && t.toFile().isDirectory()) {
+                FileUtils.deleteDirectory(t.toFile());
+            }
     }
 
     @Test