rebase with main

Author: millotp

clients/algoliasearch-client-go/.golangci.yml

@@ -50,6 +50,10 @@ linters:
     presets:
       - comments
       - std-error-handling
+    rules:
+      - path: api_search.go
+        linters:
+          - wrapcheck
 formatters:
   enable:
     - gofmt

generators/src/main/java/com/algolia/codegen/AlgoliaGoGenerator.java

@@ -49,6 +49,7 @@ public void processOpts() {
     typeMapping.put("AnyType", "any");
 
     modelNameMapping.put("range", "modelRange");
+    typeMapping.put("integer", "int");
 
     apiTestTemplateFiles.clear();
     modelTestTemplateFiles.clear();
@@ -85,7 +86,10 @@ public void processOpenAPI(OpenAPI openAPI) {
     Timeouts.enrichBundle(openAPI, additionalProperties);
     additionalProperties.put(
       "appDescription",
-      Arrays.stream(openAPI.getInfo().getDescription().split("\n")).map(line -> "// " + line).collect(Collectors.joining("\n")).trim()
+      Arrays.stream(openAPI.getInfo().getDescription().split("\n"))
+        .map(line -> "// " + line)
+        .collect(Collectors.joining("\n"))
+        .trim()
     );
   }
 
@@ -127,7 +131,8 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
       String modelName = entry.getKey();
       CodegenModel model = entry.getValue().getModels().get(0).getModel();
 
-      // for some reason the property additionalPropertiesIsAnyType is not propagated to the
+      // for some reason the property additionalPropertiesIsAnyType is not propagated
+      // to the
       // property
       for (CodegenProperty prop : model.getVars()) {
         ModelsMap propertyModel = models.get(prop.datatypeWithEnum);
@@ -154,7 +159,12 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
     for (CodegenOperation ope : operations.getOperations().getOperation()) {
       // clean up the description
       String[] lines = ope.unescapedNotes.split("\n");
-      ope.notes = (lines[0] + "\n" + Arrays.stream(lines).skip(1).map(line -> "// " + line).collect(Collectors.joining("\n"))).trim();
+      ope.notes = (lines[0] +
+        "\n" +
+        Arrays.stream(lines)
+          .skip(1)
+          .map(line -> "// " + line)
+          .collect(Collectors.joining("\n"))).trim();
 
       // enrich the params
       for (CodegenParameter param : ope.optionalParams) {
@@ -171,15 +181,13 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
         CodegenParameter param = ope.optionalParams.get(0);
 
         // move it to required, it's easier to handle im mustache
-        ope.hasOptionalParams = false;
         ope.optionalParams.clear();
 
-        ope.hasRequiredParams = true;
         ope.requiredParams.add(param);
       }
     }
 
-    ModelPruner.removeOrphans(this, operations, models);
+    ModelPruner.removeOrphanModelFiles(this, operations, models);
     Helpers.removeHelpers(operations);
     GenericPropagator.propagateGenericsToOperations(operations, models);
     return operations;
@@ -218,10 +226,8 @@ private void flattenBody(CodegenOperation ope) {
 
       if (prop.required) {
         ope.requiredParams.add(param);
-        ope.hasRequiredParams = true;
       } else {
         ope.optionalParams.add(param);
-        ope.hasOptionalParams = true;
       }
       ope.allParams.add(param);
     }

generators/src/main/java/com/algolia/codegen/cts/tests/ParametersWithDataType.java

@@ -578,7 +578,7 @@ private String getObjectNameForLanguage(String objectName) {
           case "Double":
             return "float64";
           case "Integer":
-            return "int32";
+            return "int";
           case "Long":
             return "int64";
           case "Boolean":
@@ -787,7 +787,11 @@ private boolean couldMatchEnum(Object value, CodegenProperty model) {
 
   private void sortParameters(IJsonSchemaValidationProperties spec, List<Map<String, Object>> parameters) {
     // Store ordered params from the spec
-    var orderedParams = spec.getVars().stream().map(v -> v.baseName).toList();
+    var orderedParams = spec
+      .getVars()
+      .stream()
+      .map(v -> v.baseName)
+      .toList();
 
     // Create a map to store the indices of each string in orderedParams
     Map<String, Integer> indexMap = IntStream.range(0, orderedParams.size()).boxed().collect(Collectors.toMap(orderedParams::get, i -> i));

generators/src/main/java/com/algolia/codegen/cts/tests/TestsGenerator.java

@@ -151,7 +151,10 @@ public static void setOptionalParameters(
 
     if (AlgoliaGoGenerator.canFlattenBody(ope) && ope.bodyParam != null) {
       List<CodegenProperty> vars = ope.bodyParam.getVars();
-      bodyPropsOptional = (int) vars.stream().filter(p -> !p.required).count();
+      bodyPropsOptional = (int) vars
+        .stream()
+        .filter(p -> !p.required)
+        .count();
       isBodyTooBig = vars.isEmpty();
 
       Map<String, Object> paramBody = parameters;

templates/go/api.mustache

@@ -365,6 +365,7 @@ func (c *APIClient) {{nickname}}(ctx context.Context, {{#requiredParams}}{{param
   if res == nil {
     return {{#returnType}}returnValue, {{/returnType}}reportError("res is nil")
   }
+  defer res.Body.Close()
 
 	if res.StatusCode >= 300 {
 			return {{#returnType}}returnValue, {{/returnType}}c.decodeError(res, resBody)

templates/go/client.mustache

@@ -312,24 +312,6 @@ func reportError(format string, a ...any) error {
 	return fmt.Errorf(format, a...)
 }
 
-// A wrapper for strict JSON decoding
-func newStrictDecoder(data []byte) *json.Decoder {
-	dec := json.NewDecoder(bytes.NewBuffer(data))
-	dec.DisallowUnknownFields()
-	return dec
-}
-
-// A wrapper for validating a struct, returns nil if value is not a struct
-func validateStruct(v any) error {
-  err := validator.New().Struct(v)
-  validationErrors, ok := err.(validator.ValidationErrors)
-  if ok && len(validationErrors) > 0 {
-    return validationErrors
-  }
-
-  return nil
-}
-
 // Set request body from an any
 func setBody(body any, c compression.Compression) (*bytes.Buffer, error) {
 	if body == nil {

templates/go/ingestion_helpers.mustache

@@ -1,15 +1,13 @@
-/*
-ChunkedPush Chunks the given `objects` list in subset of 1000 elements max in order to make it fit in `push` requests by leveraging the Transformation pipeline setup in the Push connector (https://www.algolia.com/doc/guides/sending-and-managing-data/send-and-update-your-data/connectors/push/).
-
-	@param indexName string - the index name to save objects into.
-	@param objects []map[string]any - List of objects to save.
-	@param action Action - The action to perform on the objects.
-	@param referenceIndexName *string - This is required when targeting an index that does not have a push connector setup (e.g. a tmp index), but you wish to attach another index's transformation to it (e.g. the source index name).
-	@param opts ...ChunkedBatchOption - Optional parameters for the request.
-	@return []WatchResponse - List of push responses.
-	@return error - Error if any.
-*/
-func (c *APIClient) ChunkedPush(indexName string, objects []map[string]any, action Action, referenceIndexName *string, opts ...ChunkedBatchOption) ([]WatchResponse, error) {
+// ChunkedPush Chunks the given `objects` list in subset of 1000 elements max in order to make it fit in `push` requests by leveraging the Transformation pipeline setup in the Push connector (https://www.algolia.com/doc/guides/sending-and-managing-data/send-and-update-your-data/connectors/push/).
+//
+// Parameters:
+//   - transformationID - Unique identifier of a transformation.
+//   - indexName string - the index name to save objects into.
+//   - objects []map[string]any - List of objects to save.
+//   - action Action - The action to perform on the objects.
+//   - referenceIndexName *string - This is required when targeting an index that does not have a push connector setup (e.g. a tmp index), but you wish to attach another index's transformation to it (e.g. the source index name).
+//   - opts - Optional parameters for the API call (e.g. WithHeaderParam, WithReadTimeout...)
+func (c *APIClient) ChunkedPush(ctx context.Context, indexName string, objects []map[string]any, action Action, referenceIndexName *string, opts ...ChunkedBatchOption) ([]WatchResponse, error) {
 	conf := config{
 		headerParams: map[string]string{},
 		waitForTasks: false,
@@ -45,18 +43,12 @@ func (c *APIClient) ChunkedPush(indexName string, objects []map[string]any, acti
 				return nil, reportError("unable to unmarshal the given `objects` to an `[]PushTaskRecords` payload: %w", err)
 			}
 
-      request := c.NewApiPushRequest(
-					indexName,
-					NewEmptyPushTaskPayload().
-						SetAction(action).
-						SetRecords(pushRecords),
-				)
-
-      if referenceIndexName != nil {
-        request = request.WithReferenceIndexName(*referenceIndexName)
-      }
+			opts := NewPushOptions()
+			if referenceIndexName != nil {
+				opts = opts.WithReferenceIndexName(*referenceIndexName)
+			}
 
-			resp, err := c.Push(request)
+			resp, err := c.Push(ctx, indexName, action, pushRecords, opts)
 			if err != nil {
 				return nil, err //nolint: wrapcheck
 			}
@@ -65,7 +57,6 @@ func (c *APIClient) ChunkedPush(indexName string, objects []map[string]any, acti
 			records = make([]map[string]any, 0, len(objects)%conf.batchSize)
 		}
 
-
 		if conf.waitForTasks && len(responses) > 0 && (len(responses)%waitBatchSize == 0 || i == len(objects)-1) {
 			var waitableResponses []WatchResponse
 
@@ -82,7 +73,7 @@ func (c *APIClient) ChunkedPush(indexName string, objects []map[string]any, acti
 							return nil, reportError("received unexpected response from the push endpoint, eventID must not be undefined")
 						}
 
-						return c.GetEvent(c.NewApiGetEventRequest(resp.RunID, *resp.EventID))
+						return c.GetEvent(ctx, resp.RunID, *resp.EventID)
 					},
 					func(response *Event, err error) (bool, error) {
 						var apiErr *APIError
@@ -104,4 +95,4 @@ func (c *APIClient) ChunkedPush(indexName string, objects []map[string]any, acti
 	}
 
 	return responses, nil
-}
+}