Update samples for sync_master_230

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/BashClientCodegen.java

@@ -1,29 +1,31 @@
 package io.swagger.codegen.languages;
 
-import io.swagger.codegen.*;
-import io.swagger.models.properties.*;
-import io.swagger.models.parameters.*;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenParameter;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
 import io.swagger.models.Model;
 import io.swagger.models.Operation;
 import io.swagger.models.Swagger;
+import io.swagger.models.parameters.BodyParameter;
+import io.swagger.models.parameters.Parameter;
+import io.swagger.models.parameters.SerializableParameter;
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.MapProperty;
 import io.swagger.models.properties.Property;
-
 import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import java.util.HashMap;
+
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.*;
-import java.io.File;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.util.Set;
 
 public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
 
@@ -578,16 +580,17 @@ public CodegenOperation fromOperation(String path, String httpMethod,
         List codesamples = (List)op.vendorExtensions.get("x-code-samples");
 
         for (Object codesample : codesamples) {
-          ObjectNode codesample_object = (ObjectNode)codesample;
+            if(codesample instanceof ObjectNode) {
+                ObjectNode codesample_object = (ObjectNode) codesample;
 
-          if((codesample_object.get("lang").asText()).equals("Shell")) {
+                if ((codesample_object.get("lang").asText()).equals("Shell")) {
 
-            op.vendorExtensions.put("x-bash-codegen-sample",
-              escapeUnsafeCharacters(
-                codesample_object.get("source").asText()));
-
-          }
+                    op.vendorExtensions.put("x-bash-codegen-sample",
+                            escapeUnsafeCharacters(
+                                    codesample_object.get("source").asText()));
 
+                }
+            }
         }
       }
 

modules/swagger-codegen/src/test/java/io/swagger/codegen/bash/BashTest.java

@@ -1,30 +1,14 @@
 package io.swagger.codegen.bash;
 
-import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenOperation;
-import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.CodegenParameter;
 import io.swagger.codegen.DefaultCodegen;
 import io.swagger.codegen.languages.BashClientCodegen;
-import io.swagger.models.ArrayModel;
-import io.swagger.models.Model;
-import io.swagger.models.ModelImpl;
 import io.swagger.models.Operation;
 import io.swagger.models.Swagger;
-import io.swagger.models.properties.ArrayProperty;
-import io.swagger.models.properties.DateTimeProperty;
-import io.swagger.models.properties.LongProperty;
-import io.swagger.models.properties.MapProperty;
-import io.swagger.models.properties.RefProperty;
-import io.swagger.models.properties.StringProperty;
 import io.swagger.parser.SwaggerParser;
-
 import org.testng.Assert;
 import org.testng.annotations.Test;
-import org.testng.annotations.ITestAnnotation;
-
-import com.google.common.collect.Sets;
-import java.util.Map;
 
 @SuppressWarnings("static-method")
 public class BashTest {
@@ -48,7 +32,7 @@ public void petstoreOperationTest() {
                 swagger);
 
         Assert.assertTrue(
-            op.vendorExtensions.containsKey("x-bash-codegen-sample"));
+            op.vendorExtensions.containsKey("x-code-samples"));
 
         Assert.assertEquals(
             op.vendorExtensions.get("x-bash-codegen-description"),

pom.xml

@@ -863,7 +863,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-parser-version>1.0.26-SNAPSHOT</swagger-parser-version>
+        <swagger-parser-version>1.0.28</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>2.3.4</felix-version>
         <swagger-core-version>1.5.12</swagger-core-version>

samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/PetApi.scala

@@ -5,9 +5,9 @@
  */
 package io.swagger.client.api
 
-import io.swagger.client.model.Pet
 import io.swagger.client.model.ApiResponse
 import java.io.File
+import io.swagger.client.model.Pet
 import io.swagger.client.core._
 import io.swagger.client.core.CollectionFormats._
 import io.swagger.client.core.ApiKeyLocations._

samples/client/petstore/android/httpclient/docs/PetApi.md

@@ -222,7 +222,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+[petstore_auth](../README.md#petstore_auth), [api_key](../README.md#api_key)
 
 ### HTTP request headers
 

samples/client/petstore/android/volley/docs/PetApi.md

@@ -222,7 +222,7 @@ Name | Type | Description  | Notes
 
 ### Authorization
 
-[api_key](../README.md#api_key), [petstore_auth](../README.md#petstore_auth)
+[petstore_auth](../README.md#petstore_auth), [api_key](../README.md#api_key)
 
 ### HTTP request headers
 

samples/client/petstore/android/volley/src/main/java/io/swagger/client/api/PetApi.java

@@ -576,7 +576,7 @@ public Pet getPetById (Long petId) throws TimeoutException, ExecutionException,
       // normal form params
     }
 
-    String[] authNames = new String[] { "api_key", "petstore_auth" };
+    String[] authNames = new String[] { "petstore_auth", "api_key" };
 
     try {
       String localVarResponse = apiInvoker.invokeAPI (basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames);
@@ -646,7 +646,7 @@ public void getPetById (Long petId, final Response.Listener<Pet> responseListene
       // normal form params
           }
 
-      String[] authNames = new String[] { "api_key", "petstore_auth" };
+      String[] authNames = new String[] { "petstore_auth", "api_key" };
 
     try {
       apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, formParams, contentType, authNames,

samples/client/petstore/async-scala/src/main/scala/io/swagger/client/api/PetApi.scala

@@ -1,8 +1,8 @@
 package io.swagger.client.api
 
-import io.swagger.client.model.Pet
-import java.io.File
 import io.swagger.client.model.ApiResponse
+import java.io.File
+import io.swagger.client.model.Pet
 import com.wordnik.swagger.client._
 import scala.concurrent.Future
 import collection.mutable

samples/client/petstore/bash/Dockerfile

@@ -0,0 +1,61 @@
+FROM ubuntu:16.10
+
+RUN apt-get update -y && apt-get full-upgrade -y
+RUN apt-get install -y bash-completion zsh curl cowsay git vim bsdmainutils
+
+ADD petstore-cli /usr/bin/petstore-cli
+ADD _petstore-cli /usr/local/share/zsh/site-functions/_petstore-cli
+ADD petstore-cli.bash-completion /etc/bash-completion.d/petstore-cli
+
+
+#
+# Install oh-my-zsh
+#
+RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" || true
+
+#
+# Enable bash completion
+#
+RUN echo '\n\
+. /etc/bash_completion\n\
+source /etc/bash-completion.d/petstore-cli\n\
+' >> ~/.bashrc
+
+#
+# Setup prompt
+#
+RUN echo 'export PS1="[Swagger Petstore] \$ "' >> ~/.bashrc
+RUN echo 'export PROMPT="[Swagger Petstore] \$ "' >> ~/.zshrc
+
+#
+# Setup a welcome message with basic instruction
+#
+RUN echo 'cat << EOF\n\
+\n\
+This Docker provides preconfigured environment for running the command\n\
+line REST client for $(tput setaf 6)Swagger Petstore$(tput sgr0).\n\
+\n\
+For convenience, you can export the following environment variables:\n\
+\n\
+$(tput setaf 3)PETSTORE_HOST$(tput sgr0) - server URL, e.g. https://example.com:8080\n\
+$(tput setaf 3)PETSTORE_API_KEY$(tput sgr0) - access token, e.g. "ASDASHJDG63456asdASSD"\n\
+$(tput setaf 3)PETSTORE_BASIC_AUTH$(tput sgr0) - basic authentication credentials, e.g.: "username:password"\n\
+\n\
+$(tput setaf 7)Basic usage:$(tput sgr0)\n\
+\n\
+$(tput setaf 3)Print the list of operations available on the service$(tput sgr0)\n\
+$ petstore-cli -h\n\
+\n\
+$(tput setaf 3)Print the service description$(tput sgr0)\n\
+$ petstore-cli --about\n\
+\n\
+$(tput setaf 3)Print detailed information about specific operation$(tput sgr0)\n\
+$ petstore-cli <operationId> -h\n\
+\n\
+By default you are logged into Zsh with full autocompletion for your REST API,\n\
+but you can switch to Bash, where basic autocompletion is also supported.\n\
+\n\
+EOF\n\
+' | tee -a ~/.bashrc ~/.zshrc
+
+ENTRYPOINT ["zsh"]

samples/client/petstore/bash/_petstore-cli

@@ -10,7 +10,7 @@
 # !
 # ! Based on: https://github.com/Valodim/zsh-curl-completion/blob/master/_curl
 # !
-# ! Generated on: 2017-02-06T21:48:13.013+01:00
+# ! Generated on: 2017-03-13T18:03:04.084+01:00
 # !
 # !
 # ! Installation:
@@ -302,7 +302,7 @@ case $state in
 假端點
 偽のエンドポイント
 가짜 엔드 포인트]" \
-            "testEnumParameters[To test enum parameters]"             "addPet[Add a new pet to the store]" \
+            "testEnumParameters[To test enum parameters]"             "testClassname[To test class name in snake case]"             "addPet[Add a new pet to the store]" \
             "deletePet[Deletes a pet]" \
             "findPetsByStatus[Finds Pets by status]" \
             "findPetsByTags[Finds Pets by tags]" \
@@ -349,6 +349,12 @@ case $state in
 )
         _describe -t actions 'operations' _op_arguments -S '' && ret=0
         ;;
+      testClassname)
+        local -a _op_arguments
+        _op_arguments=(
+                              )
+        _describe -t actions 'operations' _op_arguments -S '' && ret=0
+        ;;
       addPet)
         local -a _op_arguments
         _op_arguments=(