Release 23.7 (#75)

* Fixing lint errors in Dart * New swagger spec * Build all submodules * Bump version to 23.7.0 * Trying to stabilize Android generator * Improve dotnet * fix Java * fix Dart * Improve dotnet * Update submodules * Fixing check-urls
aspose-barcode-cloud · Jul 18, 2023 · 7f0627a · 7f0627a
1 parent 04aa3cd
commit 7f0627a
Show file tree

Hide file tree

Showing 33 changed files with 109 additions and 63 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -19,3 +19,6 @@ indent_size = 4
 
 [{CODEOWNERS,Makefile}]
 indent_style = tab
+
+[*.mustache]
+insert_final_newline = false
diff --git a/Makefile b/Makefile
@@ -1,10 +1,59 @@
 .PHONY: all
-all:
-
+all: sdk
 
 .PHONY: format
 format: format-black
 
 .PHONY: format-black
 format-black:
 	python -m black --line-length=120 .
+
+.PHONY: swagger
+swagger:
+	./scripts/update_swagger_spec.bash
+
+.PHONY: openapi
+openapi:
+	curl "https://converter.swagger.io/api/convert?url=https://api.aspose.cloud/v3.0/barcode/swagger/spec" | jq '.' > spec/aspose-barcode-cloud-openapi.json
+
+# Mark parameters as deprecated
+.PHONY: deprecated
+deprecated: openapi
+	jq '.paths[][].parameters? |= map(if .description and (.description | startswith("DEPRECATED:")) then . + {"deprecated": true} else . end)' spec/aspose-barcode-cloud-openapi.json > spec/aspose-barcode-cloud-with-deprecated.json
+
+
+# Making all SDKs
+.PHONY: sdk
+sdk: android dart dotnet go java node php python
+
+.PHONY: android
+android:
+	cd codegen && ./generate-android.bash
+
+.PHONY: dart
+dart:
+	cd codegen && ./generate-dart.bash
+
+.PHONY: dotnet
+dotnet:
+	cd codegen && ./generate-dotnet.bash
+
+.PHONY: go
+go:
+	cd codegen && ./generate-go.bash
+
+.PHONY: java
+java:
+	cd codegen && ./generate-java.bash
+
+.PHONY: node
+node:
+	cd codegen && ./generate-node.bash
+
+.PHONY: php
+php:
+	cd codegen && ./generate-php.bash
+
+.PHONY: python
+python:
+	cd codegen && ./generate-python.bash
diff --git a/codegen/Templates/csharp/api.mustache b/codegen/Templates/csharp/api.mustache
@@ -3,7 +3,6 @@
 // This source code was auto-generated by AsposeBarcodeCloudCodegen.
 //
 
-using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using {{packageName}}.Interfaces;
@@ -42,7 +41,7 @@ namespace {{packageName}}.Api
                     requestHandlers.Add(new ExternalAuthorizationRequestHandler(_configuration));
                     break;
                 default:
-                    throw new ArgumentOutOfRangeException($"Unknown AuthType={_configuration.AuthType}.");
+                    throw new System.ArgumentOutOfRangeException($"Unknown AuthType={_configuration.AuthType}.");
             }
 
             requestHandlers.Add(new DebugLogRequestHandler(_configuration));
@@ -95,10 +94,10 @@ namespace {{packageName}}.Api
             resourcePath = UrlHelper.AddPathParameter(resourcePath, "{{paramName}}", request.{{baseName}});
             {{/pathParams}}
             {{#queryParams}}
+            {{#-first}}#pragma warning disable CS0618 // Type or member is obsolete{{/-first}}
             resourcePath = UrlHelper.AddQueryParameterToUrl(resourcePath, "{{paramName}}", request.{{baseName}});
+            {{#-last}}#pragma warning restore CS0618 // Type or member is obsolete{{/-last}}
             {{/queryParams}}
-            {{#vendorExtensions}}{{^x-binary-result}}
-            {{/x-binary-result}}{{/vendorExtensions}}
             {{#hasBodyParam}}string postBody = SerializationHelper.Serialize(request.{{bodyParam.baseName}}); // http body (model) parameter{{/hasBodyParam}}
             {{#formParams}}
             if (request.{{baseName}} != null)

diff --git a/codegen/Templates/csharp/model.mustache b/codegen/Templates/csharp/model.mustache
@@ -8,7 +8,6 @@
 {{^isEnum}}
 using System;
 using System.Collections.Generic;
-using System.Text;
 using Aspose.BarCode.Cloud.Sdk.Interfaces;
 using Aspose.BarCode.Cloud.Sdk.Internal;
 {{/isEnum}}

diff --git a/codegen/Templates/csharp/requestModel.mustache b/codegen/Templates/csharp/requestModel.mustache
@@ -42,15 +42,14 @@ namespace {{packageName}}.Model.Requests
         /// <summary>
         ///     Initializes a new instance of the <see cref="{{nickname}}Request"/> class.
         /// </summary>
-        {{#allParams}}
+        {{#requiredParams}}
         /// <param name="{{paramName}}">{{description}}</param>
-        {{/allParams}}
-        public {{nickname}}Request({{#allParams}}{{{dataType}}} {{paramName}}{{^required}} = null{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+        {{/requiredParams}}
+        public {{nickname}}Request({{#requiredParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/requiredParams}}{{^requiredParams}}{{#allParams}}{{#-last}}{{{dataType}}} {{paramName}} = null {{/-last}}{{/allParams}}{{/requiredParams}})
         {
-            {{#allParams}}
+            {{#requiredParams}}
             this.{{baseName}} = {{paramName}};
-            {{/allParams}}
-        }
+            {{/requiredParams}}{{^requiredParams}}{{#allParams}}{{#-last}}this.{{baseName}} = {{paramName}};{{/-last}}{{/allParams}}{{/requiredParams}}}
 
         {{#allParams}}
         /// <summary>

diff --git a/codegen/Templates/dart/api.mustache b/codegen/Templates/dart/api.mustache
@@ -40,7 +40,7 @@ class {{classname}} {
 
     final List<String> contentTypes = [{{#consumes}}"{{{mediaType}}}"{{#hasMore}},{{/hasMore}}{{/consumes}}];
 
-    final String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    final String contentType = contentTypes.isNotEmpty ? contentTypes[0] : "application/json";
     final List<String> authNames = [{{#authMethods}}"{{name}}"{{#hasMore}}, {{/hasMore}}{{/authMethods}}];
 
     {{#hasFormParams}}

diff --git a/codegen/Templates/dart/api_client.mustache b/codegen/Templates/dart/api_client.mustache
@@ -15,8 +15,8 @@ class ApiClient {
   Map<String, String> _defaultHeaderMap = {};
   late Authentication _authentication;
 
-  final _RegList = new RegExp(r'^List<(.*)>$');
-  final _RegMap = new RegExp(r'^Map<String,(.*)>$');
+  final _regList = new RegExp(r'^List<(.*)>$');
+  final _regMap = new RegExp(r'^Map<String,(.*)>$');
 
   ApiClient(
       {String? clientId,
@@ -61,11 +61,11 @@ class ApiClient {
           {
             RegExpMatch? match;
             if (value is List &&
-                (match = _RegList.firstMatch(targetType)) != null) {
+                (match = _regList.firstMatch(targetType)) != null) {
               final newTargetType = match![1];
               return value.map((v) => _deserialize(v, newTargetType!)).toList();
             } else if (value is Map &&
-                (match = _RegMap.firstMatch(targetType)) != null) {
+                (match = _regMap.firstMatch(targetType)) != null) {
               final newTargetType = match![1];
               return new Map.fromIterables(value.keys,
                   value.values.map((v) => _deserialize(v, newTargetType!)));

diff --git a/codegen/Templates/dart/class.mustache b/codegen/Templates/dart/class.mustache
@@ -1,3 +1,5 @@
+// ignore_for_file: non_constant_identifier_names
+// ignore_for_file: deprecated_member_use_from_same_package
 class {{classname}} {
   {{#vars}}{{#description}}/* {{{description}}} */{{/description}}
   {{{datatype}}}? {{name}} = {{{defaultValue}}};
@@ -53,7 +55,7 @@ class {{classname}} {
 
   static Map<String, {{classname}}> mapFromJson(Map<String, Map<String, dynamic>> json) {
     final map = new Map<String, {{classname}}>();
-    if (json.length > 0) {
+    if (json.isNotEmpty) {
       json.forEach((String key, Map<String, dynamic> value) => map[key] = new {{classname}}.fromJson(value));
     }
     return map;

diff --git a/codegen/Templates/dart/object_doc.mustache b/codegen/Templates/dart/object_doc.mustache
@@ -10,5 +10,4 @@ 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}}]{{/defaultValue}}
 {{/vars}}
-
 {{/model}}{{/models}}
diff --git a/codegen/Templates/dart/pubspec.mustache b/codegen/Templates/dart/pubspec.mustache
@@ -14,6 +14,7 @@ environment:
   sdk: ">=2.12.0 <4.0.0"
 
 dependencies:
-  http: '>=0.13.0 <0.14.0'
+  http: '>=0.13.0 <2.0.0'
 dev_dependencies:
+  lints: ^2.1.1
   test: ^1.19.2
diff --git a/codegen/Templates/go/api_doc.mustache b/codegen/Templates/go/api_doc.mustache
@@ -25,10 +25,10 @@ Name | Type | Description  | Notes
 ### {{{operationId}}} Optional Parameters
 
 Optional parameters are passed through a pointer to a {{{classname}}}{{{nickname}}}Opts struct
-{{#allParams}}{{#-last}}
+{{#allParams}}{{#-first}}
 Name | Type | Description  | Notes
----- | ---- | ------------ | -----{{/-last}}{{/allParams}}{{#allParams}}
-{{^required}} **{{vendorExtensions.x-exportParamName}}** | {{#isFile}}**optional.Interface of {{dataType}}**{{/isFile}}{{#isPrimitiveType}}**optional.{{vendorExtensions.x-optionalDataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}{{^isListContainer}}[**optional.Interface of {{dataType}}**]({{baseType}}.md){{/isListContainer}}{{#isListContainer}}**optional.Interface of {{dataType}}**{{/isListContainer}}{{/isFile}}{{/isPrimitiveType}} | {{description}} | {{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}{{/required}}{{/allParams}}{{/hasOptionalParams}}
+---- | ---- | ------------ | -----{{/-first}}{{^required}}
+**{{vendorExtensions.x-exportParamName}}** | {{#isFile}}**optional.Interface of {{dataType}}**{{/isFile}}{{#isPrimitiveType}}**optional.{{vendorExtensions.x-optionalDataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isFile}}{{^isListContainer}}[**optional.Interface of {{dataType}}**]({{baseType}}.md){{/isListContainer}}{{#isListContainer}}**optional.Interface of {{dataType}}**{{/isListContainer}}{{/isFile}}{{/isPrimitiveType}} | {{description}} | {{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}{{/required}}{{/allParams}}{{/hasOptionalParams}}
 
 ### {{{operationId}}} Return type
 

diff --git a/codegen/Templates/java/api.mustache b/codegen/Templates/java/api.mustache
@@ -82,6 +82,7 @@ public class {{classname}} {
     {{#isDeprecated}}
     @Deprecated
     {{/isDeprecated}}
+    @SuppressWarnings("removal")
     protected com.squareup.okhttp.Call {{operationId}}Call({{operationIdCamelCase}}Request request, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object {{localVariablePrefix}}postBody = {{#bodyParam}}request.{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
 

diff --git a/codegen/Templates/python/api.mustache b/codegen/Templates/python/api.mustache
@@ -4,6 +4,7 @@
 from __future__ import absolute_import, division
 
 import re  # noqa: F401
+import warnings  # noqa: F401
 
 # python 2 and python 3 compatibility library
 import six

diff --git a/codegen/Templates/python/model.mustache b/codegen/Templates/python/model.mustache
@@ -4,6 +4,7 @@
 
 import pprint
 import re  # noqa: F401
+import warnings  # noqa: F401
 
 import six
 
@@ -215,4 +216,4 @@ class {{classname}}(object):
         """Returns true if both objects are not equal"""
         return not self == other
 {{/model}}
-{{/models}}
+{{/models}}
diff --git a/codegen/config-android.json b/codegen/config-android.json
@@ -4,7 +4,7 @@
     "androidSdkVersion": "33",
     "apiPackage": "com.aspose.barcode.cloud.demo_app",
     "artifactId": "Android Application for Barcode Processing in the Cloud via REST API",
-    "artifactVersion": "23.6.0",
+    "artifactVersion": "23.7.0",
     "groupId": "com.aspose",
     "invokerPackage": "com.aspose.barcode.cloud.demo_app",
     "modelPackage": "com.aspose.barcode.cloud.demo_app.model"

diff --git a/codegen/config-dart.json b/codegen/config-dart.json
@@ -2,6 +2,6 @@
     "browserClient": false,
     "pubDescription": "This SDK allows you to work with Aspose.BarCode for Cloud REST APIs in your Dart or Flutter applications quickly and easily",
     "pubName": "aspose_barcode_cloud",
-    "pubVersion": "0.23.6",
+    "pubVersion": "0.23.7",
     "useEnumExtension": true
 }
diff --git a/codegen/config-go.json b/codegen/config-go.json
@@ -1,4 +1,4 @@
 {
     "packageName": "barcode",
-    "packageVersion": "0.2306.0"
+    "packageVersion": "0.2307.0"
 }
diff --git a/codegen/config-java.json b/codegen/config-java.json
@@ -3,7 +3,7 @@
     "artifactDescription": "Aspose.BarCode Cloud SDK for Java",
     "artifactId": "aspose-barcode-cloud",
     "artifactUrl": "https://www.aspose.cloud",
-    "artifactVersion": "23.6.0",
+    "artifactVersion": "23.7.0",
     "developerEmail": "[email protected]",
     "developerName": "Denis Averin",
     "developerOrganization": "Aspose",

diff --git a/codegen/config-python.json b/codegen/config-python.json
@@ -1,6 +1,6 @@
 {
     "packageName": "aspose_barcode_cloud",
     "packageUrl": "https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-python",
-    "packageVersion": "23.6.0",
+    "packageVersion": "23.7.0",
     "projectName": "aspose-barcode-cloud"
 }
diff --git a/codegen/config.json b/codegen/config.json
@@ -1,9 +1,9 @@
 {
-    "artifactVersion": "23.6.0",
+    "artifactVersion": "23.7.0",
     "invokerPackage": "Aspose\\BarCode",
     "npmName": "aspose-barcode-cloud-node",
-    "npmVersion": "23.6.0",
+    "npmVersion": "23.7.0",
     "packageName": "Aspose.BarCode.Cloud.Sdk",
-    "packageVersion": "23.6.0",
+    "packageVersion": "23.7.0",
     "supportsES6": true
 }
diff --git a/codegen/generate-android.bash b/codegen/generate-android.bash
@@ -15,19 +15,19 @@ java -jar Tools/swagger-codegen-cli.jar generate -i "${specSource}" -l android -
 # java -DdebugModels -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l android -t Templates/java -o $tempDir -c config-android.json > debugModels.android.json
 # java -DdebugOperations -jar Tools/swagger-codegen-cli.jar generate -i "$specSource" -l android -t Templates/java -o $tempDir -c config-android.json > debugOperations.android.json
 
-cp "$tempDir/README.md" "$targetDir"
-cp "$tempDir/.gitignore" "$targetDir"
-cp "$tempDir/build.gradle" "$targetDir"
-cp "$tempDir/git_push.sh" "$targetDir/gradle.properties"
-cp "$tempDir/pom.xml" "$targetDir/settings.gradle"
-cp "$tempDir/gradlew" "$targetDir/app/build.gradle"
+mv "$tempDir/README.md" "$targetDir"
+mv "$tempDir/.gitignore" "$targetDir"
+mv "$tempDir/build.gradle" "$targetDir"
+mv "$tempDir/git_push.sh" "$targetDir/gradle.properties"
+mv "$tempDir/pom.xml" "$targetDir/settings.gradle"
+mv "$tempDir/gradlew" "$targetDir/app/build.gradle"
 
-cp "$tempDir/src/main/AndroidManifest.xml" "$targetDir/app/src/main/"
+mv "$tempDir/src/main/AndroidManifest.xml" "$targetDir/app/src/main/"
 
 exampleDir="$targetDir/app/src/main/java/com/aspose/barcode/cloud/demo_app"
 rm -rf "${exampleDir:?}/*"
 mkdir -p "$exampleDir" || true
-cp "$tempDir/src/main/java/com/aspose/barcode/cloud/demo_app/ApiException.java" "$exampleDir/MainActivity.kt"
+mv "$tempDir/src/main/java/com/aspose/barcode/cloud/demo_app/ApiException.java" "$exampleDir/MainActivity.kt"
 
 cp Templates/LICENSE "$targetDir/"
 

diff --git a/doc/UPGRADE_TOOLS.md b/doc/UPGRADE_TOOLS.md
@@ -12,12 +12,3 @@ Repository <https://mvnrepository.com/artifact/io.swagger/swagger-codegen-cli>
 ```sh
 curl 'https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.29/swagger-codegen-cli-2.4.29.jar' -Lo codegen/Tools/swagger-codegen-cli.jar
 ```
-
-Google Java Format
-------------------
-
-Repository <https://github.com/google/google-java-format/releases>
-
-```sh
-curl https://github.com/google/google-java-format/releases/download/google-java-format-1.9/google-java-format-1.9-all-deps.jar -Lo submodules/java/tools/google-java-format-1.9-all-deps.jar
-```
diff --git a/scripts/check-urls.py b/scripts/check-urls.py
@@ -53,6 +53,7 @@ class Curl:
         "http://localhost:12345/v3.0",
         "http://some",
         "http://urllib3.readthedocs.io/en/latest/advanced-usage.html",
+        "http://|https://|ftp://",
         "https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet/releases/tag/v{{packageVersion}}",
         "https://img.shields.io/badge/api-v{{appVersion}}-lightgrey",
         "https://pypi.org/project/{{projectName}}/",

diff --git a/scripts/new-version.py b/scripts/new-version.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
 
 from __future__ import division, print_function
 
@@ -93,7 +93,7 @@ def main(new_versions):
 
 
 def parse_args():
-    parser = argparse.ArgumentParser(usage="%s %s" % (sys.argv[0], datetime.today().strftime("%y %#m")))
+    parser = argparse.ArgumentParser(usage="%s %s" % (sys.argv[0], datetime.today().strftime("%y %m")))
     parser.add_argument("new_versions", type=int, nargs=2, help="Use separate int values like: 21 6")
     args = parser.parse_args()
     return vars(args)

diff --git a/spec/aspose-barcode-cloud.json b/spec/aspose-barcode-cloud.json
@@ -3606,7 +3606,7 @@
         },
         "Columns": {
           "type": "integer",
-          "description": "Columns count.",
+          "description": "DEPRECATED: Will be replaced with 'DataMatrix.Version' in the next release\n Columns count.",
           "format": "int32"
         },
         "DataMatrixEcc": {
@@ -3619,7 +3619,7 @@
         },
         "Rows": {
           "type": "integer",
-          "description": "Rows count.",
+          "description": "DEPRECATED: Will be replaced with 'DataMatrix.Version' in the next release\n Rows count.",
           "format": "int32"
         },
         "MacroCharacters": {
@@ -3652,7 +3652,7 @@
     },
     "DataMatrixEncodeMode": {
       "type": "string",
-      "description": "",
+      "description": "DataMatrix encoder's encoding mode, default to Auto",
       "x-enumNames": [
         "Auto",
         "ASCII",

diff --git a/submodules/android b/submodules/android
diff --git a/submodules/dart b/submodules/dart
diff --git a/submodules/dotnet b/submodules/dotnet
diff --git a/submodules/go b/submodules/go
diff --git a/submodules/java b/submodules/java