Skip to content

[go][model] Use pointers to avoid circular references #4488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[go][model] Use pointers to avoid circular references #4488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51b6d20
[go][model] Use pointers to avoid circular references
wy-z Jan 4, 2017
a669ab4
[go][model][samples] Use pointers to avoid circular references
wy-z Jan 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/go/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import ({{/imports}}{{#imports}}
type {{classname}} struct {
{{#vars}}{{#description}}
// {{{description}}}{{/description}}
{{name}} {{{datatype}}} `json:"{{baseName}},omitempty"`
{{name}} {{^isPrimitiveType}}{{^isContainer}}{{^isDate}}{{^isDateTime}}*{{/isDateTime}}{{/isDate}}{{/isContainer}}{{/isPrimitiveType}}{{{datatype}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"`
{{/vars}}
}
{{/model}}{{/models}}
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/go/model_doc.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
{{#vars}}**{{name}}** | {{#isPrimitiveType}}**{{datatype}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{^isContainer}}{{^isDate}}{{^isDateTime}}*{{/isDateTime}}{{/isDate}}{{/isContainer}}{{datatype}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
{{/vars}}

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/go/go-petstore/animal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ package petstore

type Animal struct {

ClassName string `json:"className,omitempty"`
ClassName string `json:"className"`

Color string `json:"color,omitempty"`
}
2 changes: 1 addition & 1 deletion samples/client/petstore/go/go-petstore/cat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ package petstore

type Cat struct {

ClassName string `json:"className,omitempty"`
ClassName string `json:"className"`

Color string `json:"color,omitempty"`

Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/go/go-petstore/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (


type Configuration struct {
UserName string `json:"userName,omitempty"`
Username string `json:"userName,omitempty"`
Password string `json:"password,omitempty"`
APIKeyPrefix map[string]string `json:"APIKeyPrefix,omitempty"`
APIKey map[string]string `json:"APIKey,omitempty"`
Expand Down Expand Up @@ -51,7 +51,7 @@ func NewConfiguration() *Configuration {
}

func (c *Configuration) GetBasicAuthEncodedString() string {
return base64.StdEncoding.EncodeToString([]byte(c.UserName + ":" + c.Password))
return base64.StdEncoding.EncodeToString([]byte(c.Username + ":" + c.Password))
}

func (c *Configuration) AddDefaultHeader(key string, value string) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/go/go-petstore/docs/EnumTest.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Name | Type | Description | Notes
**EnumString** | **string** | | [optional] [default to null]
**EnumInteger** | **int32** | | [optional] [default to null]
**EnumNumber** | **float64** | | [optional] [default to null]
**OuterEnum** | [**OuterEnum**](OuterEnum.md) | | [optional] [default to null]
**OuterEnum** | [***OuterEnum**](OuterEnum.md) | | [optional] [default to null]

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

Expand Down
8 changes: 6 additions & 2 deletions samples/client/petstore/go/go-petstore/docs/FakeApi.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# \FakeApi

All URIs are relative to **
All URIs are relative to *http://petstore.swagger.io/v2*

Method | HTTP request | Description
------------- | ------------- | -------------
Expand All @@ -14,6 +14,8 @@ Method | HTTP request | Description

To test \"client\" model

To test \"client\" model


### Parameters

Expand Down Expand Up @@ -83,6 +85,8 @@ void (empty response body)

To test enum parameters

To test enum parameters


### Parameters

Expand All @@ -94,7 +98,7 @@ Name | Type | Description | Notes
**enumHeaderString** | **string**| Header parameter enum test (string) | [optional] [default to -efg]
**enumQueryStringArray** | [**[]string**](string.md)| Query parameter enum test (string array) | [optional]
**enumQueryString** | **string**| Query parameter enum test (string) | [optional] [default to -efg]
**enumQueryInteger** | **float32**| Query parameter enum test (double) | [optional]
**enumQueryInteger** | **int32**| Query parameter enum test (double) | [optional]
**enumQueryDouble** | **float64**| Query parameter enum test (double) | [optional]

### Return type
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/go/go-petstore/docs/Pet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**Id** | **int64** | | [optional] [default to null]
**Category** | [**Category**](Category.md) | | [optional] [default to null]
**Category** | [***Category**](Category.md) | | [optional] [default to null]
**Name** | **string** | | [default to null]
**PhotoUrls** | **[]string** | | [default to null]
**Tags** | [**[]Tag**](Tag.md) | | [optional] [default to null]
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/go/go-petstore/docs/PetApi.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# \PetApi

All URIs are relative to **
All URIs are relative to *http://petstore.swagger.io/v2*

Method | HTTP request | Description
------------- | ------------- | -------------
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/go/go-petstore/docs/StoreApi.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# \StoreApi

All URIs are relative to **
All URIs are relative to *http://petstore.swagger.io/v2*

Method | HTTP request | Description
------------- | ------------- | -------------
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/go/go-petstore/docs/UserApi.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# \UserApi

All URIs are relative to **
All URIs are relative to *http://petstore.swagger.io/v2*

Method | HTTP request | Description
------------- | ------------- | -------------
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/go/go-petstore/dog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ package petstore

type Dog struct {

ClassName string `json:"className,omitempty"`
ClassName string `json:"className"`

Color string `json:"color,omitempty"`

Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/go/go-petstore/enum_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ type EnumTest struct {

EnumNumber float64 `json:"enum_number,omitempty"`

OuterEnum OuterEnum `json:"outerEnum,omitempty"`
OuterEnum *OuterEnum `json:"outerEnum,omitempty"`
}
6 changes: 4 additions & 2 deletions samples/client/petstore/go/go-petstore/fake_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ func NewFakeApiWithBasePath(basePath string) *FakeApi {
}

/**
* To test \"client\" model
* To test \"client\" model
*
* @param body client model
Expand Down Expand Up @@ -132,7 +133,7 @@ func (a FakeApi) TestEndpointParameters(number float32, double float64, patternW
var localVarFileBytes []byte
// authentication '(http_basic_test)' required
// http basic authentication required
if a.Configuration.UserName != "" || a.Configuration.Password != ""{
if a.Configuration.Username != "" || a.Configuration.Password != ""{
localVarHeaderParams["Authorization"] = "Basic " + a.Configuration.GetBasicAuthEncodedString()
}
// add default headers if any
Expand Down Expand Up @@ -190,6 +191,7 @@ func (a FakeApi) TestEndpointParameters(number float32, double float64, patternW
}

/**
* To test enum parameters
* To test enum parameters
*
* @param enumFormStringArray Form parameter enum test (string array)
Expand All @@ -202,7 +204,7 @@ func (a FakeApi) TestEndpointParameters(number float32, double float64, patternW
* @param enumQueryDouble Query parameter enum test (double)
* @return void
*/
func (a FakeApi) TestEnumParameters(enumFormStringArray []string, enumFormString string, enumHeaderStringArray []string, enumHeaderString string, enumQueryStringArray []string, enumQueryString string, enumQueryInteger float32, enumQueryDouble float64) (*APIResponse, error) {
func (a FakeApi) TestEnumParameters(enumFormStringArray []string, enumFormString string, enumHeaderStringArray []string, enumHeaderString string, enumQueryStringArray []string, enumQueryString string, enumQueryInteger int32, enumQueryDouble float64) (*APIResponse, error) {

var localVarHttpMethod = strings.ToUpper("Get")
// create path and map variables
Expand Down
8 changes: 4 additions & 4 deletions samples/client/petstore/go/go-petstore/format_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ type FormatTest struct {

Int64_ int64 `json:"int64,omitempty"`

Number float32 `json:"number,omitempty"`
Number float32 `json:"number"`

Float float32 `json:"float,omitempty"`

Double float64 `json:"double,omitempty"`

String_ string `json:"string,omitempty"`

Byte_ string `json:"byte,omitempty"`
Byte_ string `json:"byte"`

Binary string `json:"binary,omitempty"`

Date time.Time `json:"date,omitempty"`
Date time.Time `json:"date"`

DateTime time.Time `json:"dateTime,omitempty"`

Uuid string `json:"uuid,omitempty"`

Password string `json:"password,omitempty"`
Password string `json:"password"`
}
2 changes: 1 addition & 1 deletion samples/client/petstore/go/go-petstore/name.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ package petstore
// Model for testing model name same as property name
type Name struct {

Name int32 `json:"name,omitempty"`
Name int32 `json:"name"`

SnakeCase int32 `json:"snake_case,omitempty"`

Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/go/go-petstore/pet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ type Pet struct {

Id int64 `json:"id,omitempty"`

Category Category `json:"category,omitempty"`
Category *Category `json:"category,omitempty"`

Name string `json:"name,omitempty"`
Name string `json:"name"`

PhotoUrls []string `json:"photoUrls,omitempty"`
PhotoUrls []string `json:"photoUrls"`

Tags []Tag `json:"tags,omitempty"`

Expand Down