Skip to content

Commit

Permalink
Release 24.4 (#99)
Browse files Browse the repository at this point in the history
* Version 24.4.0

* Fix script start-release.bash

* Fix cleanup in generate-* scripts

* Update submodules

* Fix broken url check
  • Loading branch information
Denis-Averin committed Apr 29, 2024
1 parent 1b77ed1 commit 6030ad9
Show file tree
Hide file tree
Showing 70 changed files with 358 additions and 241 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 Aspose Pty Ltd
Copyright (c) 2024 Aspose Pty Ltd

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
21 changes: 0 additions & 21 deletions codegen/Templates/LICENSE

This file was deleted.

5 changes: 0 additions & 5 deletions codegen/Templates/csharp/Configuration.mustache
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
{{>partial_header}}
//
// This source code was auto-generated by AsposeBarcodeCloudCodegen.
//

using System.Collections.Generic;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
Expand Down
22 changes: 15 additions & 7 deletions codegen/Templates/csharp/api.mustache
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{{>partial_header}}
//
// This source code was auto-generated by AsposeBarcodeCloudCodegen.
//

using System.Collections.Generic;
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using {{packageName}}.Interfaces;
Expand Down Expand Up @@ -89,7 +86,7 @@ namespace {{packageName}}.Api
{{#-first}}var headerParams = new Dictionary<string, string>();{{/-first}}
{{/headerParams}}
{{#formParams}}
{{#-first}}var formParams = new Dictionary<string, object>();{{/-first}}
{{#-first}}var formParams = new MultipartFormDataContent();{{/-first}}
{{/formParams}}
{{#pathParams}}
resourcePath = UrlHelper.AddPathParameter(resourcePath, "{{paramName}}", request.{{baseName}});
Expand All @@ -104,8 +101,19 @@ namespace {{packageName}}.Api
if (request.{{baseName}} != null)
{
{{#isFile}}
formParams.Add("{{paramName}}", ApiInvoker.ToFileInfo(request.{{baseName}}, "{{baseName}}"));
{{/isFile}}{{^isFile}}formParams.Add("{{baseName}}", request.{{baseName}}); // form parameter{{/isFile}}
formParams.Add(new StreamContent(request.{{baseName}}), "{{baseName}}", "{{paramName}}.png");
{{/isFile}}
{{^isFile}}
{{#isCollectionFormatMulti}}
foreach (var oneParam in request.{{baseName}})
{
formParams.Add(new StringContent(oneParam.ToString()), "{{baseName}}");
}
{{/isCollectionFormatMulti}}
{{#isPrimitiveType}}
formParams.Add(new StringContent(request.{{baseName}}.ToString()), "{{baseName}}");
{{/isPrimitiveType}}
{{/isFile}}
}
{{/formParams}}
{{#vendorExtensions}}{{#x-binary-result}} return await _apiInvoker.InvokeBinaryApiAsync(
Expand Down
26 changes: 26 additions & 0 deletions codegen/Templates/csharp/api_test.mustache
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{{! Used as Interfaces.cs }}
using System.Threading.Tasks;
using {{packageName}}.Model;
using {{packageName}}.Model.Requests;

namespace {{packageName}}.Interfaces
{ {{#operations}}
/// <summary>
/// {{classname}} interface
/// </summary>
public interface I{{classname}}
{
{{#operation}}

/// <summary>
/// {{summary}} {{notes}}
/// </summary>
/// <param name="request">Request. <see cref="{{nickname}}Request" /></param>
/// <returns>
/// A task representing the asynchronous operation.{{#returnType}} The result is a <see cref="{{returnType}}" />.{{/returnType}}
/// </returns>
{{#returnType}}Task<{{{returnType}}}>{{/returnType}}{{^returnType}}Task{{/returnType}} {{nickname}}Async({{nickname}}Request request);
{{/operation}}
}
{{/operations}}
}
4 changes: 0 additions & 4 deletions codegen/Templates/csharp/model.mustache
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{{#models}}
{{#model}}
{{>partial_header}}
//
// This source code was auto-generated by AsposeBarcodeCloudCodegen.
//

{{^isEnum}}
using System;
Expand Down
5 changes: 2 additions & 3 deletions codegen/Templates/csharp/requestModel.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,16 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------

//
// This source code was auto-generated by AsposeBarcodeCloudCodegen.
//

using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;

namespace {{packageName}}.Model.Requests
{
/// <summary>
/// Request model for <see cref="{{packageName}}.Api.{{classname}}.{{nickname}}Async" /> operation.
/// </summary>
[SuppressMessage("ReSharper", "UnusedAutoPropertyAccessor.Global")]
public class {{nickname}}Request{{#vendorExtensions}}{{#x-csharp-implements}} : {{x-csharp-implements}}{{/x-csharp-implements}}{{/vendorExtensions}}
{
{{#hasParams}}
Expand Down
29 changes: 20 additions & 9 deletions codegen/Templates/dart/api.mustache
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import 'dart:typed_data' show Uint8List;

import 'package:http/http.dart' show MultipartFile, MultipartRequest;
import 'package:http/http.dart' show MultipartFile;

import '../http/multipart_request_plus.dart';
import '../../aspose_barcode_cloud.dart';
import '../api_helper.dart';

Expand Down Expand Up @@ -52,30 +53,40 @@ class {{classname}} {
{{#hasFormParams}}
if(contentType.startsWith("multipart/form-data")) {
bool hasFields = false;
MultipartRequest? mp;
MultipartRequestPlus? mp;
{{#formParams}}{{#notFile}}
if ({{paramName}} != null) {
hasFields = true;
mp.fields['{{baseName}}'] = parameterToString({{paramName}});
{{#isCollectionFormatMulti}}
final List<String> stringValues = {{paramName}}.map((i) => parameterToString(i)).toList();
mp.fields['{{baseName}}'] = stringValues;
{{/isCollectionFormatMulti}}
{{^isCollectionFormatMulti}}
mp.fields['{{baseName}}'] = [parameterToString({{paramName}})];
{{/isCollectionFormatMulti}}
}
{{/notFile}}{{#isFile}}
mp = MultipartRequest('{{httpMethod}}', Uri.parse(requestPath));
// ignore: unnecessary_null_comparison
mp = MultipartRequestPlus('{{httpMethod}}', Uri.parse(requestPath));
{{#required}}
hasFields = true;
mp.files.add({{paramName}});
{{/required}}
{{^required}}
if ({{paramName}} != null) {
hasFields = true;
mp.fields['{{baseName}}'] = {{paramName}}.field;
mp.files.add({{paramName}});
}
{{/required}}

{{/isFile}}{{/formParams}}
if (hasFields) {
postBody = mp;
}
}
else {
{{#formParams}}{{#notFile}}if ({{paramName}} != null)
formParams['{{baseName}}'] = parameterToString({{paramName}});{{/notFile}}
{{/formParams}}
{{#formParams}}{{#notFile}}if ({{paramName}} != null)
formParams['{{baseName}}'] = parameterToString({{paramName}});{{/notFile}}
{{/formParams}}
}
{{/hasFormParams}}

Expand Down
7 changes: 4 additions & 3 deletions codegen/Templates/dart/api_client.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

import 'dart:convert' show json;

import 'package:http/http.dart' as Http show Client, MultipartRequest, Response;
import 'package:http/http.dart' as Http show Client, Response;

import 'http/multipart_request_plus.dart';
import '../aspose_barcode_cloud.dart';
import 'api_helper.dart';
import 'auth/authentication.dart';
Expand Down Expand Up @@ -140,8 +141,8 @@ class ApiClient {
headerParams.addAll(_defaultHeaderMap);
headerParams['Content-Type'] = contentType;
if(body is Http.MultipartRequest) {
final request = Http.MultipartRequest(method, Uri.parse(url));
if(body is MultipartRequestPlus) {
final request = MultipartRequestPlus(method, Uri.parse(url));
request.fields.addAll(body.fields);
request.files.addAll(body.files);
request.headers.addAll(body.headers);
Expand Down
7 changes: 4 additions & 3 deletions codegen/Templates/dart/enum.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ class {{classname}} {
{{classname}}._internal(this._value);

{{#allowableValues}}
{{#enumVars}}
{{#values}}
{{#description}}
/// {{description}}
{{/description}}
static {{classname}} {{name}} = {{classname}}._internal({{{value}}});
{{/enumVars}}
// ignore: non_constant_identifier_names
static final {{classname}} {{.}} = {{classname}}._internal("{{.}}");
{{/values}}
{{/allowableValues}}

/// Creates a {{classname}} instance from a JSON representation.
Expand Down
2 changes: 1 addition & 1 deletion codegen/Templates/dart/pubspec.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ platforms:
windows:

environment:
sdk: ">=2.12.0 <4.0.0"
sdk: ">=2.17.0 <4.0.0"
dependencies:
http: '>=0.13.0 <2.0.0'
Expand Down
30 changes: 20 additions & 10 deletions codegen/Templates/go/api.mustache
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{{>partial_header}}
package {{packageName}}

{{#operations}}
import (
"context"
"io/ioutil"
"io"
"net/http"
"net/url"
"reflect"
Expand Down Expand Up @@ -44,6 +43,7 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx context.Context{{#hasParams}
httpMethod = strings.ToUpper("{{httpMethod}}")
postBody interface{}
fileName string
fileFieldName string
fileBytes []byte
{{#returnType}}returnValue {{#isResponseFile}}[]byte{{/isResponseFile}}{{^isResponseFile}}{{{returnType}}}{{/isResponseFile}}{{/returnType}}
)
Expand Down Expand Up @@ -159,24 +159,25 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx context.Context{{#hasParams}
{{#hasFormParams}}
{{#formParams}}
{{#isFile}}
{{#required}}
{{#required}}
requestFile := {{paramName}}
if requestFile != nil {
fileName = requestFile.Name()
fileFieldName = "{{baseName}}"
var err error
fileBytes, err = ioutil.ReadAll(requestFile)
fileBytes, err = io.ReadAll(io.Reader(requestFile))
if err != nil {
return returnValue, nil, err
}
}
{{/required}}
{{^required}}
{{/required}}
{{^required}}

if optionals != nil && optionals.{{vendorExtensions.x-exportParamName}}.IsSet() {
if requestFile, fileOk := optionals.{{vendorExtensions.x-exportParamName}}.Value().({{dataType}}); fileOk {
fileName = requestFile.Name()
var err error
fileBytes, err = ioutil.ReadAll(requestFile)
fileBytes, err = io.ReadAll(io.Reader(requestFile))
if err != nil {
return returnValue, nil, err
}
Expand All @@ -187,15 +188,24 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx context.Context{{#hasParams}
return {{#returnType}}returnValue, {{/returnType}}nil, reportError("{{paramName}} should be {{dataType}} or []byte")
}
}
{{/required}}
{{/required}}
{{/isFile}}
{{^isFile}}
{{#required}}
formParams.Add("{{baseName}}", parameterToString({{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
{{/required}}
{{^required}}
if optionals != nil && optionals.{{vendorExtensions.x-exportParamName}}.IsSet() {
{{#isCollectionFormatMulti}}
values := reflect.ValueOf(optionals.{{vendorExtensions.x-exportParamName}}.Value());
for i := 0; i < values.Len(); i++ {
item := values.Index(i)
formParams.Add("{{baseName}}", parameterToString(item, ""))
}
{{/isCollectionFormatMulti}}
{{^isCollectionFormatMulti}}
formParams.Add("{{baseName}}", parameterToString(optionals.{{vendorExtensions.x-exportParamName}}.Value(), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
{{/isCollectionFormatMulti}}
}
{{/required}}
{{/isFile}}
Expand Down Expand Up @@ -235,7 +245,7 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx context.Context{{#hasParams}
}
{{/isApiKey}}
{{/authMethods}}
r, err := a.client.prepareRequest(ctx, requestPath, httpMethod, postBody, headerParams, queryParams, formParams, fileName, fileBytes)
r, err := a.client.prepareRequest(ctx, requestPath, httpMethod, postBody, headerParams, queryParams, formParams, fileName, fileFieldName, fileBytes)
if err != nil {
return {{#returnType}}returnValue, {{/returnType}}nil, err
}
Expand All @@ -245,7 +255,7 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx context.Context{{#hasParams}
return {{#returnType}}returnValue, {{/returnType}}httpResponse, err
}

responseBody, err := ioutil.ReadAll(httpResponse.Body)
responseBody, err := io.ReadAll(io.Reader(httpResponse.Body))
httpResponse.Body.Close()
if err != nil {
return {{#returnType}}returnValue, {{/returnType}}httpResponse, err
Expand Down
4 changes: 2 additions & 2 deletions codegen/Templates/go/client.mustache
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{{>partial_header}}
package {{packageName}}

import (
Expand Down Expand Up @@ -152,6 +151,7 @@ func (c *APIClient) prepareRequest(
queryParams netUrl.Values,
formParams netUrl.Values,
fileName string,
fileFieldName string,
fileBytes []byte) (httpReq *http.Request, err error) {
var body *bytes.Buffer
Expand Down Expand Up @@ -196,7 +196,7 @@ func (c *APIClient) prepareRequest(
if len(fileBytes) > 0 && fileName != "" {
w.Boundary()
//_, fileNm := filepath.Split(fileName)
part, err := w.CreateFormFile("file", filepath.Base(fileName))
part, err := w.CreateFormFile(fileFieldName, filepath.Base(fileName))
if err != nil {
return nil, err
}
Expand Down
1 change: 0 additions & 1 deletion codegen/Templates/go/configuration.mustache
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{{>partial_header}}
package {{packageName}}

import (
Expand Down
1 change: 0 additions & 1 deletion codegen/Templates/go/model.mustache
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{{>partial_header}}
package {{packageName}}
{{#models}}{{#imports}}
import ({{/imports}}{{#imports}}
Expand Down
3 changes: 1 addition & 2 deletions codegen/Templates/go/response.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"fmt"
"golang.org/x/oauth2"
"io"
"io/ioutil"
"net/url"
"time"
)
Expand Down Expand Up @@ -86,7 +85,7 @@ func (js jwtSource) Token() (*oauth2.Token, error) {
return nil, fmt.Errorf("jwt: cannot fetch token: %v", err)
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(io.LimitReader(resp.Body, 1<<20))
body, err := io.ReadAll(io.LimitReader(resp.Body, 1<<20))
if err != nil {
return nil, fmt.Errorf("jwt: cannot read token: %v", err)
}
Expand Down
Loading

0 comments on commit 6030ad9

Please sign in to comment.