[crystal][client] some fix and minor improvement (#9416)

* [crystal][client] remove redundant include JSON::Serializable

* [crystal][client] fix syntax error

* [crystal][client] fix shard name

* [crystal][client] add 'require "json"'

* [crystal][client] update sample projects

modules/openapi-generator/src/main/resources/crystal/configuration.mustache

@@ -197,7 +197,10 @@ module {{moduleName}}
 
     # Returns Auth Settings hash for api client.
     def auth_settings
-      Hash{ {{#authMethods}}{{#isApiKey}}"{{name}}" => {
+      Hash{
+{{#authMethods}}
+{{#isApiKey}}
+        "{{name}}" => {
           type: "api_key",
           in: {{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{#isKeyInQuery}}"query"{{/isKeyInQuery}},
           key: "{{keyParamName}}",
@@ -206,8 +209,7 @@ module {{moduleName}}
 {{/isApiKey}}
 {{#isBasic}}
 {{#isBasicBasic}}
-        "{{name}}" =>
+        "{{name}}" => {
-          {
           type: "basic",
           in: "header",
           key: "Authorization",
@@ -215,8 +217,7 @@ module {{moduleName}}
         },
 {{/isBasicBasic}}
 {{#isBasicBearer}}
-        "{{name}}" =>
+        "{{name}}" => {
-          {
           type: "bearer",
           in: "header",
           {{#bearerFormat}}
@@ -228,8 +229,7 @@ module {{moduleName}}
 {{/isBasicBearer}}
 {{/isBasic}}
 {{#isOAuth}}
-        "{{name}}" =>
+        "{{name}}" => {
-          {
           type: "oauth2",
           in: "header",
           key: "Authorization",

modules/openapi-generator/src/main/resources/crystal/model.mustache

@@ -1,5 +1,6 @@
 # {{#lambdaPrefixWithHash}}{{> api_info}}{{/lambdaPrefixWithHash}}
 
+require "json"
 require "time"
 
 module {{moduleName}}

modules/openapi-generator/src/main/resources/crystal/partial_model_generic.mustache

@@ -1,8 +1,10 @@
   {{#description}}
   # {{{description}}}
   {{/description}}
-  class {{classname}}{{#parent}} < {{{.}}}{{/parent}} include JSON::Serializable
+  class {{classname}}{{#parent}} < {{{.}}}{{/parent}}
-   include JSON::Serializable {{#vars}}
+    include JSON::Serializable
+
+    {{#vars}}
     {{#description}}
     # {{{description}}}
     {{/description}}

modules/openapi-generator/src/main/resources/crystal/shard.mustache

@@ -1,4 +1,4 @@
-name: {{{moduleName}}}
+name: {{{shardName}}}
 version: {{{shardVersion}}}
 authors:
   - {{{shardAuthors}}}

samples/client/petstore/crystal/shard.yml

@@ -1,4 +1,4 @@
-name: Petstore
+name: petstore
 version: 1.0.0
 authors:
   - 

samples/client/petstore/crystal/src/petstore/configuration.cr

@@ -205,14 +205,14 @@ module Petstore
 
     # Returns Auth Settings hash for api client.
     def auth_settings
-      Hash{ "api_key" => {
+      Hash{
+        "api_key" => {
           type: "api_key",
           in: "header",
           key: "api_key",
           value: api_key_with_prefix("api_key")
         },
-        "petstore_auth" =>
+        "petstore_auth" => {
-          {
           type: "oauth2",
           in: "header",
           key: "Authorization",

samples/client/petstore/crystal/src/petstore/models/api_response.cr

@@ -8,20 +8,20 @@
 #OpenAPI Generator version: 5.2.0-SNAPSHOT
 #
 
+require "json"
 require "time"
 
 module Petstore
   # Describes the result of uploading an image resource
-  class ApiResponse include JSON::Serializable
+  class ApiResponse
     include JSON::Serializable
+
     @[JSON::Field(key: code, type: Int32)]
     property code : Int32
 
-
     @[JSON::Field(key: type, type: String)]
     property _type : String
 
-
     @[JSON::Field(key: message, type: String)]
     property message : String
 

samples/client/petstore/crystal/src/petstore/models/category.cr

@@ -8,16 +8,17 @@
 #OpenAPI Generator version: 5.2.0-SNAPSHOT
 #
 
+require "json"
 require "time"
 
 module Petstore
   # A category for a pet
-  class Category include JSON::Serializable
+  class Category
     include JSON::Serializable
+
     @[JSON::Field(key: id, type: Int64)]
     property id : Int64
 
-
     @[JSON::Field(key: name, type: String)]
     property name : String
 

samples/client/petstore/crystal/src/petstore/models/order.cr

@@ -8,33 +8,30 @@
 #OpenAPI Generator version: 5.2.0-SNAPSHOT
 #
 
+require "json"
 require "time"
 
 module Petstore
   # An order for a pets from the pet store
-  class Order include JSON::Serializable
+  class Order
     include JSON::Serializable
+
     @[JSON::Field(key: id, type: Int64)]
     property id : Int64
 
-
     @[JSON::Field(key: petId, type: Int64)]
     property pet_id : Int64
 
-
     @[JSON::Field(key: quantity, type: Int32)]
     property quantity : Int32
 
-
     @[JSON::Field(key: shipDate, type: Time)]
     property ship_date : Time
 
-
     # Order Status
     @[JSON::Field(key: status, type: String)]
     property status : String
 
-
     @[JSON::Field(key: complete, type: Bool)]
     property complete : Bool
 

samples/client/petstore/crystal/src/petstore/models/pet.cr

@@ -8,32 +8,29 @@
 #OpenAPI Generator version: 5.2.0-SNAPSHOT
 #
 
+require "json"
 require "time"
 
 module Petstore
   # A pet for sale in the pet store
-  class Pet include JSON::Serializable
+  class Pet
     include JSON::Serializable
+
     @[JSON::Field(key: id, type: Int64)]
     property id : Int64
 
-
     @[JSON::Field(key: category, type: Category)]
     property category : Category
 
-
     @[JSON::Field(key: name, type: String)]
     property name : String
 
-
     @[JSON::Field(key: photoUrls, type: Array(String))]
     property photo_urls : Array(String)
 
-
     @[JSON::Field(key: tags, type: Array(Tag))]
     property tags : Array(Tag)
 
-
     # pet status in the store
     @[JSON::Field(key: status, type: String)]
     property status : String

samples/client/petstore/crystal/src/petstore/models/tag.cr

@@ -8,16 +8,17 @@
 #OpenAPI Generator version: 5.2.0-SNAPSHOT
 #
 
+require "json"
 require "time"
 
 module Petstore
   # A tag for a pet
-  class Tag include JSON::Serializable
+  class Tag
     include JSON::Serializable
+
     @[JSON::Field(key: id, type: Int64)]
     property id : Int64
 
-
     @[JSON::Field(key: name, type: String)]
     property name : String
 

samples/client/petstore/crystal/src/petstore/models/user.cr

@@ -8,40 +8,35 @@
 #OpenAPI Generator version: 5.2.0-SNAPSHOT
 #
 
+require "json"
 require "time"
 
 module Petstore
   # A User who is purchasing from the pet store
-  class User include JSON::Serializable
+  class User
     include JSON::Serializable
+
     @[JSON::Field(key: id, type: Int64)]
     property id : Int64
 
-
     @[JSON::Field(key: username, type: String)]
     property username : String
 
-
     @[JSON::Field(key: firstName, type: String)]
     property first_name : String
 
-
     @[JSON::Field(key: lastName, type: String)]
     property last_name : String
 
-
     @[JSON::Field(key: email, type: String)]
     property email : String
 
-
     @[JSON::Field(key: password, type: String)]
     property password : String
 
-
     @[JSON::Field(key: phone, type: String)]
     property phone : String
 
-
     # User Status
     @[JSON::Field(key: userStatus, type: Int32)]
     property user_status : Int32