Merge branch 'develop_2.0' into library-template-jersey2

modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache

@@ -216,7 +216,7 @@ public class ApiInvoker {
       }
       else if(String.class.equals(cls)) {
         if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1)
-          return json.substring(1, json.length() - 2);
+          return json.substring(1, json.length() - 1);
         else
           return json;
       }

modules/swagger-codegen/src/main/resources/objc/Configuration-body.mustache

@@ -54,7 +54,7 @@
     NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password];
     NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding];
     basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]];
-    
+
     return basicAuthCredentials;
 }
 
@@ -81,7 +81,7 @@
     if ([self.loggingFileHanlder isKindOfClass:[NSFileHandle class]]) {
         [self.loggingFileHanlder closeFile];
     }
-    
+
     _loggingFile = loggingFile;
     _loggingFileHanlder = [NSFileHandle fileHandleForWritingAtPath:_loggingFile];
     if (_loggingFileHanlder == nil) {
@@ -103,15 +103,28 @@
 #pragma mark -
 
 - (NSDictionary *) authSettings {
-    return @{ 
+    return @{
-                @"api_key": @{
+{{#authMethods}}
-                    @"type": @"api_key",
+{{#isApiKey}}
-                    @"in": @"header",
+               @"{{name}}":
-                    @"key": @"api_key",
+                   @{
-                    @"value": [self getApiKeyWithPrefix:@"api_key"]
+                       @"type": @"api_key",
-                },
+                       @"in": {{#isKeyInHeader}}@"header"{{/isKeyInHeader}}{{#isKeyInQuery}}@"query"{{/isKeyInQuery}},
-              
+                       @"key": @"{{keyParamName}}",
-            };
+                       @"value": [self getApiKeyWithPrefix:@"{{keyParamName}}"]
+                   },
+{{/isApiKey}}
+{{#isBasic}}
+               @"{{name}}":
+                   @{
+                       @"type": @"basic",
+                       @"in": @"header",
+                       @"key": @"Authorization",
+                       @"value": [self getBasicAuthToken]
+                   },
+{{/isBasic}}
+{{/authMethods}}
+               };
 }
 
 @end

modules/swagger-codegen/src/main/resources/scala/apiInvoker.mustache

@@ -59,7 +59,7 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
     if (cls == classOf[String]) {
       json match {
         case s: String => {
-          if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 2)
+          if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 1)
           else s
         }
         case _ => null

pom.xml

@@ -469,10 +469,10 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>1.0.9-SNAPSHOT</swagger-parser-version>
+        <swagger-parser-version>1.0.10-SNAPSHOT</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>2.3.4</felix-version>
-        <swagger-core-version>1.5.0</swagger-core-version>
+        <swagger-core-version>1.5.3-SNAPSHOT</swagger-core-version>
         <scala-test-version>2.1.4</scala-test-version>
         <commons-io-version>2.3</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>

samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java

@@ -216,7 +216,7 @@ public class ApiInvoker {
       }
       else if(String.class.equals(cls)) {
         if(json != null && json.startsWith("\"") && json.endsWith("\"") && json.length() > 1)
-          return json.substring(1, json.length() - 2);
+          return json.substring(1, json.length() - 1);
         else
           return json;
       }

samples/client/petstore/objc/SwaggerClient/SWGConfiguration.m

@@ -54,7 +54,7 @@
     NSString *basicAuthCredentials = [NSString stringWithFormat:@"%@:%@", self.username, self.password];
     NSData *data = [basicAuthCredentials dataUsingEncoding:NSUTF8StringEncoding];
     basicAuthCredentials = [NSString stringWithFormat:@"Basic %@", [data base64EncodedStringWithOptions:0]];
-    
+
     return basicAuthCredentials;
 }
 
@@ -81,7 +81,7 @@
     if ([self.loggingFileHanlder isKindOfClass:[NSFileHandle class]]) {
         [self.loggingFileHanlder closeFile];
     }
-    
+
     _loggingFile = loggingFile;
     _loggingFileHanlder = [NSFileHandle fileHandleForWritingAtPath:_loggingFile];
     if (_loggingFileHanlder == nil) {
@@ -103,15 +103,15 @@
 #pragma mark -
 
 - (NSDictionary *) authSettings {
-    return @{ 
+    return @{
-                @"api_key": @{
+               @"api_key":
-                    @"type": @"api_key",
+                   @{
-                    @"in": @"header",
+                       @"type": @"api_key",
-                    @"key": @"api_key",
+                       @"in": @"header",
-                    @"value": [self getApiKeyWithPrefix:@"api_key"]
+                       @"key": @"api_key",
-                },
+                       @"value": [self getApiKeyWithPrefix:@"api_key"]
-              
+                   },
-            };
+               };
 }
 
 @end

samples/client/petstore/scala/src/main/scala/io/swagger/client/ApiInvoker.scala

@@ -59,7 +59,7 @@ class ApiInvoker(val mapper: ObjectMapper = ScalaJsonUtil.getJsonMapper,
     if (cls == classOf[String]) {
       json match {
         case s: String => {
-          if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 2)
+          if (s.startsWith("\"") && s.endsWith("\"") && s.length > 1) s.substring(1, s.length - 1)
           else s
         }
         case _ => null