Skip to content

Commit fed84ce

Browse files
committed
fix nullable in go and remove test
1 parent 635faa6 commit fed84ce

File tree

5 files changed

+20
-59
lines changed

5 files changed

+20
-59
lines changed

clients/algoliasearch-client-go/algolia/utils/utils.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (v Nullable[T]) Get() *T {
2626

2727
func (v *Nullable[T]) Set(val *T) {
2828
v.value = val
29-
v.isSet = true
29+
v.isSet = val != nil
3030
}
3131

3232
func (v Nullable[T]) IsSet() bool {
@@ -39,16 +39,18 @@ func (v *Nullable[T]) Unset() {
3939
}
4040

4141
func NewNullable[T any](val *T) *Nullable[T] {
42-
return &Nullable[T]{value: val, isSet: true}
42+
return &Nullable[T]{value: val, isSet: val != nil}
4343
}
4444

4545
func (v Nullable[T]) MarshalJSON() ([]byte, error) {
4646
return json.Marshal(v.value)
4747
}
4848

4949
func (v *Nullable[T]) UnmarshalJSON(src []byte) error {
50-
v.isSet = true
51-
return json.Unmarshal(src, &v.value)
50+
err := json.Unmarshal(src, &v.value)
51+
v.isSet = v.value != nil
52+
53+
return err
5254
}
5355

5456
// IsNilOrEmpty checks if an input is nil or empty.

scripts/cts/testServer/algoliaMock.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,6 @@ function addRoutes(app: Express): void {
3737
processingTimeMS: 0,
3838
});
3939
});
40-
41-
app.get('/1/runs/:runID/events/:eventID', (req, res) => {
42-
res.json({
43-
eventID: req.params.eventID,
44-
runID: req.params.runID,
45-
status: null,
46-
type: 'log',
47-
batchSize: 100,
48-
data: null,
49-
publishedAt: '2023-10-03T12:00:00Z',
50-
});
51-
});
5240
}
5341

5442
export function algoliaMockServer(): Promise<Server> {

specs/ingestion/common/schemas/source.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ SourceDocker:
352352
properties:
353353
image:
354354
type: string
355-
description: Shortname of the image, as returned by the referential.
355+
description: Name of the connector.
356356
example: zendesk
357357
configuration:
358358
type: object

templates/go/model_simple.mustache

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,16 +274,26 @@ func (o {{classname}}) MarshalJSON() ([]byte, error) {
274274
}
275275
{{/vendorExtensions.x-golang-is-container}}
276276
{{^vendorExtensions.x-golang-is-container}}
277-
if {{#required}}true{{/required}}{{^required}}o.{{name}}.IsSet(){{/required}} {
277+
{{#required}}
278+
toSerialize["{{baseName}}"] = o.{{name}}.Get()
279+
{{/required}}
280+
{{^required}}
281+
if o.{{name}}.IsSet() {
278282
toSerialize["{{baseName}}"] = o.{{name}}.Get()
279283
}
284+
{{/required}}
280285
{{/vendorExtensions.x-golang-is-container}}
281286
{{/isNullable}}
282287
{{! if argument is not nullable, don't set it if it is nil}}
283288
{{^isNullable}}
284-
if {{#required}}true{{/required}}{{^required}}o.{{name}} != nil{{/required}} {
289+
{{#required}}
290+
toSerialize["{{baseName}}"] = o.{{name}}
291+
{{/required}}
292+
{{^required}}
293+
if o.{{name}} != nil {
285294
toSerialize["{{baseName}}"] = o.{{name}}
286295
}
296+
{{/required}}
287297
{{/isNullable}}
288298
{{/vars}}
289299
{{#isAdditionalPropertiesTrue}}
@@ -443,4 +453,4 @@ func (o {{classname}}) String() string {
443453
}
444454
{{/isAdditionalPropertiesTrue}}
445455
return fmt.Sprintf("{{classname}} {\n%s}", out)
446-
}
456+
}

tests/CTS/client/ingestion/getEvent.json

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)