Skip to content

Commit 3178a1a

Browse files
Bartosz-D3VBartosz-D3V
authored
Change header from pointer to value (#74)
#73 * Change header from pointer to value
1 parent 0d7f7cc commit 3178a1a

File tree

17 files changed

+75
-75
lines changed

17 files changed

+75
-75
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ const countResults = `query countResults($condition: Condition!){
116116
}`
117117

118118
type GraphqlClient interface {
119-
CountResults(condition Condition, header *http.Header) (*http.Response, error)
119+
CountResults(condition Condition, header http.Header) (*http.Response, error)
120120
}
121121

122-
func (c *graphqlClient) CountResults(ctx context.Context, condition Condition, header *http.Header) (*http.Response, error) {
122+
func (c *graphqlClient) CountResults(ctx context.Context, condition Condition, header http.Header) (*http.Response, error) {
123123
params := make(map[string]interface{}, 1)
124124
params["condition"] = condition
125125

‎client/client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
// A Client is an interface that defines a contract of grafik internal GraphQL client.
1212
// It can be mocked with tools like https://github.com/golang/mock in unit tests.
1313
type Client interface {
14-
Execute(ctx context.Context, query string, params map[string]interface{}, header *http.Header) (*http.Response, error)
14+
Execute(ctx context.Context, query string, params map[string]interface{}, header http.Header) (*http.Response, error)
1515
}
1616

1717
// client is a private struct that can be created with New function.
@@ -33,7 +33,7 @@ func New(endpoint string, httpClient *http.Client) Client {
3333

3434
// Execute is a receiver function used by generated grafik client to execute HTTP requests.
3535
// Caller method is responsible for closing the body reader.
36-
func (c *client) Execute(ctx context.Context, query string, params map[string]interface{}, header *http.Header) (*http.Response, error) {
36+
func (c *client) Execute(ctx context.Context, query string, params map[string]interface{}, header http.Header) (*http.Response, error) {
3737
q := c.formatQuery(query)
3838
req := GraphQLRequest{
3939
Query: q,
@@ -50,7 +50,7 @@ func (c *client) Execute(ctx context.Context, query string, params map[string]in
5050
}
5151

5252
if header != nil {
53-
httpReq.Header = *header
53+
httpReq.Header = header
5454
}
5555
httpReq.Header.Set("Content-Type", "application/json")
5656

‎client/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func TestClient_Execute_CustomHeader_Success(t *testing.T) {
6666
client := New(svr.URL, svr.Client())
6767
params := make(map[string]interface{})
6868
params["code"] = "EU"
69-
res, err := client.Execute(context.TODO(), query, params, &expHeader)
69+
res, err := client.Execute(context.TODO(), query, params, expHeader)
7070
assert.NoError(t, err)
7171

7272
b, err := io.ReadAll(res.Body)

‎evaluator/evaluator_test.go

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,18 @@ const renameFileWithId = %[1]cmutation RenameFileWithId($id: ID!, $name: String!
5252
}%[1]c
5353
5454
type FilesClient interface {
55-
GetFileNameWithId(ctx context.Context, id string, header *http.Header) (*http.Response, error)
56-
RenameFileWithId(ctx context.Context, id string, name string, header *http.Header) (*http.Response, error)
55+
GetFileNameWithId(ctx context.Context, id string, header http.Header) (*http.Response, error)
56+
RenameFileWithId(ctx context.Context, id string, name string, header http.Header) (*http.Response, error)
5757
}
5858
59-
func (c *filesClient) GetFileNameWithId(ctx context.Context, id string, header *http.Header) (*http.Response, error) {
59+
func (c *filesClient) GetFileNameWithId(ctx context.Context, id string, header http.Header) (*http.Response, error) {
6060
params := make(map[string]interface{}, 1)
6161
params["id"] = id
6262
6363
return c.ctrl.Execute(ctx, getFileNameWithId, params, header)
6464
}
6565
66-
func (c *filesClient) RenameFileWithId(ctx context.Context, id string, name string, header *http.Header) (*http.Response, error) {
66+
func (c *filesClient) RenameFileWithId(ctx context.Context, id string, name string, header http.Header) (*http.Response, error) {
6767
params := make(map[string]interface{}, 2)
6868
params["id"] = id
6969
params["name"] = name
@@ -158,10 +158,10 @@ const getAllFilmsProducers = %[1]cquery GetAllFilmsProducers {
158158
}%[1]c
159159
160160
type FilmsClient interface {
161-
GetAllFilmsProducers(ctx context.Context, header *http.Header) (*http.Response, error)
161+
GetAllFilmsProducers(ctx context.Context, header http.Header) (*http.Response, error)
162162
}
163163
164-
func (c *filmsClient) GetAllFilmsProducers(ctx context.Context, header *http.Header) (*http.Response, error) {
164+
func (c *filmsClient) GetAllFilmsProducers(ctx context.Context, header http.Header) (*http.Response, error) {
165165
params := make(map[string]interface{}, 0)
166166
167167
return c.ctrl.Execute(ctx, getAllFilmsProducers, params, header)
@@ -244,10 +244,10 @@ const getAllResults = %[1]cquery GetAllResults {
244244
}%[1]c
245245
246246
type MathClient interface {
247-
GetAllResults(ctx context.Context, header *http.Header) (*http.Response, error)
247+
GetAllResults(ctx context.Context, header http.Header) (*http.Response, error)
248248
}
249249
250-
func (c *mathClient) GetAllResults(ctx context.Context, header *http.Header) (*http.Response, error) {
250+
func (c *mathClient) GetAllResults(ctx context.Context, header http.Header) (*http.Response, error) {
251251
params := make(map[string]interface{}, 0)
252252
253253
return c.ctrl.Execute(ctx, getAllResults, params, header)
@@ -330,10 +330,10 @@ const getAllResults = %[1]cquery GetAllResults {
330330
}%[1]c
331331
332332
type MathClient interface {
333-
GetAllResults(ctx context.Context, header *http.Header) (*http.Response, error)
333+
GetAllResults(ctx context.Context, header http.Header) (*http.Response, error)
334334
}
335335
336-
func (c *mathClient) GetAllResults(ctx context.Context, header *http.Header) (*http.Response, error) {
336+
func (c *mathClient) GetAllResults(ctx context.Context, header http.Header) (*http.Response, error) {
337337
params := make(map[string]interface{}, 0)
338338
339339
return c.ctrl.Execute(ctx, getAllResults, params, header)
@@ -436,10 +436,10 @@ const getHeroWithId123ABC = %[1]cquery GetHeroWithId123ABC {
436436
}%[1]c
437437
438438
type SpecificHeroClient interface {
439-
GetHeroWithId123ABC(ctx context.Context, header *http.Header) (*http.Response, error)
439+
GetHeroWithId123ABC(ctx context.Context, header http.Header) (*http.Response, error)
440440
}
441441
442-
func (c *specificHeroClient) GetHeroWithId123ABC(ctx context.Context, header *http.Header) (*http.Response, error) {
442+
func (c *specificHeroClient) GetHeroWithId123ABC(ctx context.Context, header http.Header) (*http.Response, error) {
443443
params := make(map[string]interface{}, 0)
444444
445445
return c.ctrl.Execute(ctx, getHeroWithId123ABC, params, header)
@@ -526,10 +526,10 @@ const getDepartment = %[1]cquery getDepartment {
526526
}%[1]c
527527
528528
type CompanyClient interface {
529-
GetDepartment(ctx context.Context, header *http.Header) (*http.Response, error)
529+
GetDepartment(ctx context.Context, header http.Header) (*http.Response, error)
530530
}
531531
532-
func (c *companyClient) GetDepartment(ctx context.Context, header *http.Header) (*http.Response, error) {
532+
func (c *companyClient) GetDepartment(ctx context.Context, header http.Header) (*http.Response, error) {
533533
params := make(map[string]interface{}, 0)
534534
535535
return c.ctrl.Execute(ctx, getDepartment, params, header)
@@ -613,10 +613,10 @@ const getCapsulesByFullSelector = %[1]cquery GetCapsulesByFullSelector($order: S
613613
}%[1]c
614614
615615
type CapsulesClient interface {
616-
GetCapsulesByFullSelector(ctx context.Context, order string, mission string, originalLaunch Date, id string, sort string, header *http.Header) (*http.Response, error)
616+
GetCapsulesByFullSelector(ctx context.Context, order string, mission string, originalLaunch Date, id string, sort string, header http.Header) (*http.Response, error)
617617
}
618618
619-
func (c *capsulesClient) GetCapsulesByFullSelector(ctx context.Context, order string, mission string, originalLaunch Date, id string, sort string, header *http.Header) (*http.Response, error) {
619+
func (c *capsulesClient) GetCapsulesByFullSelector(ctx context.Context, order string, mission string, originalLaunch Date, id string, sort string, header http.Header) (*http.Response, error) {
620620
params := make(map[string]interface{}, 5)
621621
params["order"] = order
622622
params["mission"] = mission
@@ -708,10 +708,10 @@ const getCapsulesByPositions = %[1]cquery GetCapsulesByPositions($find: [[Positi
708708
}%[1]c
709709
710710
type CapsulesClient interface {
711-
GetCapsulesByPositions(ctx context.Context, find [][]Position, limit [][]Limit, selector [][]string, header *http.Header) (*http.Response, error)
711+
GetCapsulesByPositions(ctx context.Context, find [][]Position, limit [][]Limit, selector [][]string, header http.Header) (*http.Response, error)
712712
}
713713
714-
func (c *capsulesClient) GetCapsulesByPositions(ctx context.Context, find [][]Position, limit [][]Limit, selector [][]string, header *http.Header) (*http.Response, error) {
714+
func (c *capsulesClient) GetCapsulesByPositions(ctx context.Context, find [][]Position, limit [][]Limit, selector [][]string, header http.Header) (*http.Response, error) {
715715
params := make(map[string]interface{}, 3)
716716
params["find"] = find
717717
params["limit"] = limit
@@ -801,10 +801,10 @@ const getCapsulesByPositions = %[1]cquery GetCapsulesByPositions($find: [[[Posit
801801
}%[1]c
802802
803803
type CapsulesClient interface {
804-
GetCapsulesByPositions(ctx context.Context, find [][][]Position, limit [][][]Limit, selector [][][]string, header *http.Header) (*http.Response, error)
804+
GetCapsulesByPositions(ctx context.Context, find [][][]Position, limit [][][]Limit, selector [][][]string, header http.Header) (*http.Response, error)
805805
}
806806
807-
func (c *capsulesClient) GetCapsulesByPositions(ctx context.Context, find [][][]Position, limit [][][]Limit, selector [][][]string, header *http.Header) (*http.Response, error) {
807+
func (c *capsulesClient) GetCapsulesByPositions(ctx context.Context, find [][][]Position, limit [][][]Limit, selector [][][]string, header http.Header) (*http.Response, error) {
808808
params := make(map[string]interface{}, 3)
809809
params["find"] = find
810810
params["limit"] = limit
@@ -894,10 +894,10 @@ const getAllMoviesWhereActorsOfTheMovieActedIn = %[1]cquery GetAllMoviesWhereAct
894894
}%[1]c
895895
896896
type MovieClient interface {
897-
GetAllMoviesWhereActorsOfTheMovieActedIn(ctx context.Context, title string, header *http.Header) (*http.Response, error)
897+
GetAllMoviesWhereActorsOfTheMovieActedIn(ctx context.Context, title string, header http.Header) (*http.Response, error)
898898
}
899899
900-
func (c *movieClient) GetAllMoviesWhereActorsOfTheMovieActedIn(ctx context.Context, title string, header *http.Header) (*http.Response, error) {
900+
func (c *movieClient) GetAllMoviesWhereActorsOfTheMovieActedIn(ctx context.Context, title string, header http.Header) (*http.Response, error) {
901901
params := make(map[string]interface{}, 1)
902902
params["title"] = title
903903
@@ -995,10 +995,10 @@ fragment InformatoryRocketInfo on Rocket {
995995
}%[1]c
996996
997997
type RocketClient interface {
998-
GetShortRocketInfo(ctx context.Context, header *http.Header) (*http.Response, error)
998+
GetShortRocketInfo(ctx context.Context, header http.Header) (*http.Response, error)
999999
}
10001000
1001-
func (c *rocketClient) GetShortRocketInfo(ctx context.Context, header *http.Header) (*http.Response, error) {
1001+
func (c *rocketClient) GetShortRocketInfo(ctx context.Context, header http.Header) (*http.Response, error) {
10021002
params := make(map[string]interface{}, 0)
10031003
10041004
return c.ctrl.Execute(ctx, getShortRocketInfo, params, header)
@@ -1087,10 +1087,10 @@ const getCountriesAndContinents = %[1]cquery getCountriesAndContinents {
10871087
}%[1]c
10881088
10891089
type CountriesClient interface {
1090-
GetCountriesAndContinents(ctx context.Context, header *http.Header) (*http.Response, error)
1090+
GetCountriesAndContinents(ctx context.Context, header http.Header) (*http.Response, error)
10911091
}
10921092
1093-
func (c *countriesClient) GetCountriesAndContinents(ctx context.Context, header *http.Header) (*http.Response, error) {
1093+
func (c *countriesClient) GetCountriesAndContinents(ctx context.Context, header http.Header) (*http.Response, error) {
10941094
params := make(map[string]interface{}, 0)
10951095
10961096
return c.ctrl.Execute(ctx, getCountriesAndContinents, params, header)
@@ -1181,10 +1181,10 @@ const getCharacters = %[1]cquery getCharacters {
11811181
}%[1]c
11821182
11831183
type CharacterClient interface {
1184-
GetCharacters(ctx context.Context, header *http.Header) (*http.Response, error)
1184+
GetCharacters(ctx context.Context, header http.Header) (*http.Response, error)
11851185
}
11861186
1187-
func (c *characterClient) GetCharacters(ctx context.Context, header *http.Header) (*http.Response, error) {
1187+
func (c *characterClient) GetCharacters(ctx context.Context, header http.Header) (*http.Response, error) {
11881188
params := make(map[string]interface{}, 0)
11891189
11901190
return c.ctrl.Execute(ctx, getCharacters, params, header)
@@ -1272,10 +1272,10 @@ const getCharacters = %[1]cquery getCharacters {
12721272
}%[1]c
12731273
12741274
type CharacterClient interface {
1275-
GetCharacters(ctx context.Context, header *http.Header) (*http.Response, error)
1275+
GetCharacters(ctx context.Context, header http.Header) (*http.Response, error)
12761276
}
12771277
1278-
func (c *characterClient) GetCharacters(ctx context.Context, header *http.Header) (*http.Response, error) {
1278+
func (c *characterClient) GetCharacters(ctx context.Context, header http.Header) (*http.Response, error) {
12791279
params := make(map[string]interface{}, 0)
12801280
12811281
return c.ctrl.Execute(ctx, getCharacters, params, header)
@@ -1359,10 +1359,10 @@ const getCharactersId = %[1]cquery getCharactersId {
13591359
}%[1]c
13601360
13611361
type CharacterClient interface {
1362-
GetCharactersId(ctx context.Context, header *http.Header) (*http.Response, error)
1362+
GetCharactersId(ctx context.Context, header http.Header) (*http.Response, error)
13631363
}
13641364
1365-
func (c *characterClient) GetCharactersId(ctx context.Context, header *http.Header) (*http.Response, error) {
1365+
func (c *characterClient) GetCharactersId(ctx context.Context, header http.Header) (*http.Response, error) {
13661366
params := make(map[string]interface{}, 0)
13671367
13681368
return c.ctrl.Execute(ctx, getCharactersId, params, header)
@@ -1467,10 +1467,10 @@ const getCharacters = %[1]cquery getCharacters {
14671467
}%[1]c
14681468
14691469
type PlanetClient interface {
1470-
GetCharacters(ctx context.Context, header *http.Header) (*http.Response, error)
1470+
GetCharacters(ctx context.Context, header http.Header) (*http.Response, error)
14711471
}
14721472
1473-
func (c *planetClient) GetCharacters(ctx context.Context, header *http.Header) (*http.Response, error) {
1473+
func (c *planetClient) GetCharacters(ctx context.Context, header http.Header) (*http.Response, error) {
14741474
params := make(map[string]interface{}, 0)
14751475
14761476
return c.ctrl.Execute(ctx, getCharacters, params, header)
@@ -1555,10 +1555,10 @@ const getCharacters = %[1]cquery getCharacters {
15551555
}%[1]c
15561556
15571557
type CharacterClient interface {
1558-
GetCharacters(ctx context.Context, header *http.Header) (*http.Response, error)
1558+
GetCharacters(ctx context.Context, header http.Header) (*http.Response, error)
15591559
}
15601560
1561-
func (c *characterClient) GetCharacters(ctx context.Context, header *http.Header) (*http.Response, error) {
1561+
func (c *characterClient) GetCharacters(ctx context.Context, header http.Header) (*http.Response, error) {
15621562
params := make(map[string]interface{}, 0)
15631563
15641564
return c.ctrl.Execute(ctx, getCharacters, params, header)
@@ -1655,10 +1655,10 @@ fragment InformatoryRocketInfo on Rocket {
16551655
}%[1]c
16561656
16571657
type RocketClient interface {
1658-
GetShortRocketInfo(ctx context.Context, header *http.Header) (*http.Response, error)
1658+
GetShortRocketInfo(ctx context.Context, header http.Header) (*http.Response, error)
16591659
}
16601660
1661-
func (c *rocketClient) GetShortRocketInfo(ctx context.Context, header *http.Header) (*http.Response, error) {
1661+
func (c *rocketClient) GetShortRocketInfo(ctx context.Context, header http.Header) (*http.Response, error) {
16621662
params := make(map[string]interface{}, 0)
16631663
16641664
return c.ctrl.Execute(ctx, getShortRocketInfo, params, header)
@@ -1767,10 +1767,10 @@ const getRepositoryInformation = %[1]cquery getRepositoryInformation {
17671767
}%[1]c
17681768
17691769
type GitClient interface {
1770-
GetRepositoryInformation(ctx context.Context, header *http.Header) (*http.Response, error)
1770+
GetRepositoryInformation(ctx context.Context, header http.Header) (*http.Response, error)
17711771
}
17721772
1773-
func (c *gitClient) GetRepositoryInformation(ctx context.Context, header *http.Header) (*http.Response, error) {
1773+
func (c *gitClient) GetRepositoryInformation(ctx context.Context, header http.Header) (*http.Response, error) {
17741774
params := make(map[string]interface{}, 0)
17751775
17761776
return c.ctrl.Execute(ctx, getRepositoryInformation, params, header)
@@ -1848,10 +1848,10 @@ const getFileNameWithId = %[1]cquery GetFileNameWithId($id: ID!) {
18481848
}%[1]c
18491849
18501850
type CommentsClient interface {
1851-
GetFileNameWithId(ctx context.Context, id string, header *http.Header) (*http.Response, error)
1851+
GetFileNameWithId(ctx context.Context, id string, header http.Header) (*http.Response, error)
18521852
}
18531853
1854-
func (c *commentsClient) GetFileNameWithId(ctx context.Context, id string, header *http.Header) (*http.Response, error) {
1854+
func (c *commentsClient) GetFileNameWithId(ctx context.Context, id string, header http.Header) (*http.Response, error) {
18551855
params := make(map[string]interface{}, 1)
18561856
params["id"] = id
18571857
@@ -1940,10 +1940,10 @@ const getFileNameWithId = %[1]cquery GetFileNameWithId($id: ID!) {
19401940
}%[1]c
19411941
19421942
type FieldClient interface {
1943-
GetFileNameWithId(ctx context.Context, id string, header *http.Header) (*http.Response, error)
1943+
GetFileNameWithId(ctx context.Context, id string, header http.Header) (*http.Response, error)
19441944
}
19451945
1946-
func (c *fieldClient) GetFileNameWithId(ctx context.Context, id string, header *http.Header) (*http.Response, error) {
1946+
func (c *fieldClient) GetFileNameWithId(ctx context.Context, id string, header http.Header) (*http.Response, error) {
19471947
params := make(map[string]interface{}, 1)
19481948
params["id"] = id
19491949

‎evaluator/helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ func (e *evaluator) genClientCode() {
354354
// genOpsInterface generates public interface for grafik client.
355355
// For example:
356356
// type SpaceXClient interface {
357-
// AddOrUpdateHardcodedUser(rocketName string, usersOnConflict UsersOnConflict, header *http.Header) (*http.Response, error)
357+
// AddOrUpdateHardcodedUser(rocketName string, usersOnConflict UsersOnConflict, header http.Header) (*http.Response, error)
358358
// }
359359
func (e *evaluator) genOpsInterface() {
360360
ops := e.queryDocument.Operations

‎examples/basic_mutation/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func main() {
1515
Timeout: 10 * time.Second,
1616
}
1717
client := New(spacexUrl, httpClient)
18-
headers := &http.Header{
18+
headers := http.Header{
1919
"Date": []string{time.Now().String()},
2020
}
2121
onConflict := UsersOnConflict{

‎examples/basic_mutation/spacex_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ const addOrUpdateHardcodedUser = `mutation addOrUpdateHardcodedUser($rocketName:
4848
}`
4949

5050
type SpaceXClient interface {
51-
AddOrUpdateHardcodedUser(ctx context.Context, rocketName string, usersOnConflict UsersOnConflict, header *http.Header) (*http.Response, error)
51+
AddOrUpdateHardcodedUser(ctx context.Context, rocketName string, usersOnConflict UsersOnConflict, header http.Header) (*http.Response, error)
5252
}
5353

54-
func (c *spaceXClient) AddOrUpdateHardcodedUser(ctx context.Context, rocketName string, usersOnConflict UsersOnConflict, header *http.Header) (*http.Response, error) {
54+
func (c *spaceXClient) AddOrUpdateHardcodedUser(ctx context.Context, rocketName string, usersOnConflict UsersOnConflict, header http.Header) (*http.Response, error) {
5555
params := make(map[string]interface{}, 2)
5656
params["rocketName"] = rocketName
5757
params["usersOnConflict"] = usersOnConflict

‎examples/basic_query/spacex_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ const getRocketResults = `query getRocketResults($limit: Int){
3737
}`
3838

3939
type SpaceXClient interface {
40-
GetRocketResults(ctx context.Context, limit int, header *http.Header) (*http.Response, error)
40+
GetRocketResults(ctx context.Context, limit int, header http.Header) (*http.Response, error)
4141
}
4242

43-
func (c *spaceXClient) GetRocketResults(ctx context.Context, limit int, header *http.Header) (*http.Response, error) {
43+
func (c *spaceXClient) GetRocketResults(ctx context.Context, limit int, header http.Header) (*http.Response, error) {
4444
params := make(map[string]interface{}, 1)
4545
params["limit"] = limit
4646

‎examples/basic_query_2/countries_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ const getPolandInfo = `query getPolandInfo {
3333
}`
3434

3535
type CountriesClient interface {
36-
GetPolandInfo(ctx context.Context, header *http.Header) (*http.Response, error)
36+
GetPolandInfo(ctx context.Context, header http.Header) (*http.Response, error)
3737
}
3838

39-
func (c *countriesClient) GetPolandInfo(ctx context.Context, header *http.Header) (*http.Response, error) {
39+
func (c *countriesClient) GetPolandInfo(ctx context.Context, header http.Header) (*http.Response, error) {
4040
params := make(map[string]interface{}, 0)
4141

4242
return c.ctrl.Execute(ctx, getPolandInfo, params, header)

0 commit comments

Comments
 (0)