Skip to content

Commit 7b8168e

Browse files
Release 25.1 V4 (#85)
* Generate code for new v4.0 version Code and tests fixed Updated code after spec change Fixed tests Fixed tests Generate form content type changed to multipart Removed code for form-encoded content Regenerate after spec changed Fixed fetch token exception Bug fix Added snippets for set source and manual fetch token Recognition snippets added Added pom.xml snippet for documentation Added examples for generate doc pages Switch to common credentials template Added scripts for snippets testing Snippets changed Code updated after operationId addition *Request models renames to *RequestWrapper Fixed tests and snippets Update year and version * Added snippets test to ci Added token auth to snippets * Migrate to okhttp3 Bug fix * Update setup version * Java version updated * Some updates Added debug command * Changed test ci pipeline * Disable cache * DEBUG * Copy dependencies to output dir * Fixed lint errors * README updated * Don't print on success in ExceptionMessageParsed tests * Enable cache --------- Co-authored-by: Denis Averin <denis.averin@aspose.com>
1 parent c75b702 commit 7b8168e

File tree

275 files changed

+5558
-18445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

275 files changed

+5558
-18445
lines changed

.github/workflows/maven.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v4
19-
- name: Set up JDK 1.8
20-
uses: actions/setup-java@v3
19+
- name: Set up JDK 11
20+
uses: actions/setup-java@v4
2121
with:
2222
# Use same in Dockerfile
2323
distribution: 'corretto'
24-
java-version: 8
24+
java-version: 11
2525
cache: 'maven'
2626

2727
- name: Maven Compile
@@ -30,7 +30,10 @@ jobs:
3030
- name: Test with Maven
3131
env:
3232
TEST_CONFIGURATION_ACCESS_TOKEN: ${{ secrets.TEST_CONFIGURATION_ACCESS_TOKEN }}
33-
run: mvn test
33+
run: |
34+
chmod +x scripts/*
35+
make build
36+
make test
3437
3538
# TODO: Move to pack.yml
3639
# - name: Build the Docker image

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ aspose-barcode-cloud.iml
1313
.idea
1414

1515
**/configuration*.json
16+
snippets_test/
1617

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM maven:3-amazoncorretto-8-debian
1+
FROM maven:3-amazoncorretto-11-debian
22
RUN apt-get update \
33
&& apt-get install -y make \
44
&& rm -rf /var/lib/apt/lists/*

Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ lint:
1919
.PHONY: build
2020
build:
2121
mvn compile -Dmaven.test.skip=true
22+
mvn dependency:copy-dependencies -DoutputDirectory=target/lib/
2223

2324
.PHONY: test
2425
test:
2526
mvn test
27+
./scripts/run_snippets.sh
2628

2729
.PHONY: display-updates
2830
display-updates:

README.md

+47-117
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
[![Java CI with Maven](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-java/actions/workflows/maven.yml/badge.svg?branch=main)](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-java/actions/workflows/maven.yml)
55
[![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Freleases.aspose.cloud%2Fjava%2Frepo%2Fcom%2Faspose%2Faspose-barcode-cloud%2Fmaven-metadata.xml)](https://releases.aspose.cloud/java/repo/com/aspose/aspose-barcode-cloud/)
66

7-
- API version: 3.0
8-
- SDK version: 24.12.0
7+
- API version: 4.0
8+
- SDK version: 25.1.0
9+
10+
## SDK and API Version Compatibility:
11+
12+
- SDK Version 25.1 and Later: Starting from SDK version 25.1, all subsequent versions are compatible with API Version v4.0.
13+
- SDK Version 24.12 and Earlier: These versions are compatible with API Version v3.0.
914

1015
## Demo applications
1116

@@ -68,7 +73,7 @@ Add this dependency to your project's POM:
6873
<dependency>
6974
<groupId>com.aspose</groupId>
7075
<artifactId>aspose-barcode-cloud</artifactId>
71-
<version>24.12.0</version>
76+
<version>25.1.0</version>
7277
<scope>compile</scope>
7378
</dependency>
7479
```
@@ -83,7 +88,7 @@ mvn clean package
8388

8489
Then manually install the following JARs:
8590

86-
- `target/aspose-barcode-cloud-24.12.0.jar`
91+
- `target/aspose-barcode-cloud-25.1.0.jar`
8792
- `target/lib/*.jar`
8893

8994
## Getting Started
@@ -95,33 +100,33 @@ package com.aspose.barcode.cloud.examples;
95100

96101
import com.aspose.barcode.cloud.ApiClient;
97102
import com.aspose.barcode.cloud.ApiException;
98-
import com.aspose.barcode.cloud.api.BarcodeApi;
103+
import com.aspose.barcode.cloud.api.GenerateApi;
104+
import com.aspose.barcode.cloud.api.ScanApi;
105+
import com.aspose.barcode.cloud.model.BarcodeImageFormat;
99106
import com.aspose.barcode.cloud.model.BarcodeResponseList;
100-
import com.aspose.barcode.cloud.model.DecodeBarcodeType;
101107
import com.aspose.barcode.cloud.model.EncodeBarcodeType;
102-
import com.aspose.barcode.cloud.requests.GetBarcodeGenerateRequest;
103-
import com.aspose.barcode.cloud.requests.ScanBarcodeRequest;
108+
import com.aspose.barcode.cloud.requests.GenerateRequestWrapper;
109+
import com.aspose.barcode.cloud.requests.ScanMultipartRequestWrapper;
104110

105111
import java.io.File;
106-
import java.util.Collections;
107112

108113
public class Example {
109114
public static void main(String[] args) {
110115
ApiClient client =
111116
new ApiClient(
112117
"Client Id from https://dashboard.aspose.cloud/applications",
113118
"Client Secret from https://dashboard.aspose.cloud/applications");
114-
client.setReadTimeout(5 * 60 * 1000);
115119

116-
BarcodeApi api = new BarcodeApi(client);
120+
GenerateApi genApi = new GenerateApi(client);
121+
ScanApi scanApi = new ScanApi(client);
117122

118123
try {
119124
System.out.println("Generating barcode...");
120-
File barcodeImage = generateBarcode(api);
125+
File barcodeImage = generateBarcode(genApi);
121126
System.out.println("Barcode image saved to file " + barcodeImage.getAbsolutePath());
122127

123128
System.out.println("Recognizing barcode on image...");
124-
BarcodeResponseList recognized = scanBarcode(api, barcodeImage);
129+
BarcodeResponseList recognized = scanBarcode(scanApi, barcodeImage);
125130
System.out.print("Barcode on image:");
126131
System.out.println(recognized.toString());
127132
} catch (ApiException e) {
@@ -130,21 +135,20 @@ public class Example {
130135
}
131136
}
132137

133-
private static File generateBarcode(BarcodeApi api) throws ApiException {
134-
String type = EncodeBarcodeType.QR.toString();
138+
private static File generateBarcode(GenerateApi api) throws ApiException {
139+
EncodeBarcodeType type = EncodeBarcodeType.QR;
135140
String text = "Aspose.BarCode for Cloud Sample";
136-
GetBarcodeGenerateRequest request = new GetBarcodeGenerateRequest(type, text);
137-
request.textLocation = "None";
141+
GenerateRequestWrapper request = new GenerateRequestWrapper(type, text);
142+
request.imageFormat = BarcodeImageFormat.JPEG;
138143

139-
return api.getBarcodeGenerate(request);
144+
return api.generate(request);
140145
}
141146

142-
private static BarcodeResponseList scanBarcode(BarcodeApi api, File barcodeImage)
147+
private static BarcodeResponseList scanBarcode(ScanApi api, File barcodeImage)
143148
throws ApiException {
144-
ScanBarcodeRequest request = new ScanBarcodeRequest(barcodeImage);
145-
request.decodeTypes = Collections.singletonList(DecodeBarcodeType.QR);
149+
ScanMultipartRequestWrapper request = new ScanMultipartRequestWrapper(barcodeImage);
146150

147-
return api.scanBarcode(request);
151+
return api.scanMultipart(request);
148152
}
149153
}
150154

@@ -165,114 +169,40 @@ All Aspose.BarCode for Cloud SDKs, helper scripts and templates are licensed und
165169

166170
## Documentation for API Endpoints
167171

168-
All URIs are relative to *<https://api.aspose.cloud/v3.0>*
172+
All URIs are relative to *<https://api.aspose.cloud/v4.0>*
169173

170174
Class | Method | HTTP request | Description
171175
----- | ------ | ------------ | -----------
172-
*BarcodeApi* | [**getBarcodeGenerate**](docs/BarcodeApi.md#getBarcodeGenerate) | **GET** /barcode/generate | Generate barcode.
173-
*BarcodeApi* | [**getBarcodeRecognize**](docs/BarcodeApi.md#getBarcodeRecognize) | **GET** /barcode/{name}/recognize | Recognize barcode from a file on server.
174-
*BarcodeApi* | [**postBarcodeRecognizeFromUrlOrContent**](docs/BarcodeApi.md#postBarcodeRecognizeFromUrlOrContent) | **POST** /barcode/recognize | Recognize barcode from an url or from request body. Request body can contain raw data bytes of the image with content-type \&quot;application/octet-stream\&quot;. An image can also be passed as a form field.
175-
*BarcodeApi* | [**postGenerateMultiple**](docs/BarcodeApi.md#postGenerateMultiple) | **POST** /barcode/generateMultiple | Generate multiple barcodes and return in response stream
176-
*BarcodeApi* | [**putBarcodeGenerateFile**](docs/BarcodeApi.md#putBarcodeGenerateFile) | **PUT** /barcode/{name}/generate | Generate barcode and save on server (from query params or from file with json or xml content)
177-
*BarcodeApi* | [**putBarcodeRecognizeFromBody**](docs/BarcodeApi.md#putBarcodeRecognizeFromBody) | **PUT** /barcode/{name}/recognize | Recognition of a barcode from file on server with parameters in body.
178-
*BarcodeApi* | [**putGenerateMultiple**](docs/BarcodeApi.md#putGenerateMultiple) | **PUT** /barcode/{name}/generateMultiple | Generate image with multiple barcodes and put new file on server
179-
*BarcodeApi* | [**scanBarcode**](docs/BarcodeApi.md#scanBarcode) | **POST** /barcode/scan | Quickly scan a barcode from an image.
180-
*FileApi* | [**copyFile**](docs/FileApi.md#copyFile) | **PUT** /barcode/storage/file/copy/{srcPath} | Copy file
181-
*FileApi* | [**deleteFile**](docs/FileApi.md#deleteFile) | **DELETE** /barcode/storage/file/{path} | Delete file
182-
*FileApi* | [**downloadFile**](docs/FileApi.md#downloadFile) | **GET** /barcode/storage/file/{path} | Download file
183-
*FileApi* | [**moveFile**](docs/FileApi.md#moveFile) | **PUT** /barcode/storage/file/move/{srcPath} | Move file
184-
*FileApi* | [**uploadFile**](docs/FileApi.md#uploadFile) | **PUT** /barcode/storage/file/{path} | Upload file
185-
*FolderApi* | [**copyFolder**](docs/FolderApi.md#copyFolder) | **PUT** /barcode/storage/folder/copy/{srcPath} | Copy folder
186-
*FolderApi* | [**createFolder**](docs/FolderApi.md#createFolder) | **PUT** /barcode/storage/folder/{path} | Create the folder
187-
*FolderApi* | [**deleteFolder**](docs/FolderApi.md#deleteFolder) | **DELETE** /barcode/storage/folder/{path} | Delete folder
188-
*FolderApi* | [**getFilesList**](docs/FolderApi.md#getFilesList) | **GET** /barcode/storage/folder/{path} | Get all files and folders within a folder
189-
*FolderApi* | [**moveFolder**](docs/FolderApi.md#moveFolder) | **PUT** /barcode/storage/folder/move/{srcPath} | Move folder
190-
*StorageApi* | [**getDiscUsage**](docs/StorageApi.md#getDiscUsage) | **GET** /barcode/storage/disc | Get disc usage
191-
*StorageApi* | [**getFileVersions**](docs/StorageApi.md#getFileVersions) | **GET** /barcode/storage/version/{path} | Get file versions
192-
*StorageApi* | [**objectExists**](docs/StorageApi.md#objectExists) | **GET** /barcode/storage/exist/{path} | Check if file or folder exists
193-
*StorageApi* | [**storageExists**](docs/StorageApi.md#storageExists) | **GET** /barcode/storage/{storageName}/exist | Check if storage exists
176+
*GenerateApi* | [**generate**](docs/GenerateApi.md#generate) | **GET** /barcode/generate/{barcodeType} | Generate barcode using GET request with parameters in route and query string.
177+
*GenerateApi* | [**generateBody**](docs/GenerateApi.md#generateBody) | **POST** /barcode/generate-body | Generate barcode using POST request with parameters in body in json or xml format.
178+
*GenerateApi* | [**generateMultipart**](docs/GenerateApi.md#generateMultipart) | **POST** /barcode/generate-multipart | Generate barcode using POST request with parameters in multipart form.
179+
*RecognizeApi* | [**recognize**](docs/RecognizeApi.md#recognize) | **GET** /barcode/recognize | Recognize barcode from file on server using GET requests with parameters in route and query string.
180+
*RecognizeApi* | [**recognizeBase64**](docs/RecognizeApi.md#recognizeBase64) | **POST** /barcode/recognize-body | Recognize barcode from file in request body using POST requests with parameters in body in json or xml format.
181+
*RecognizeApi* | [**recognizeMultipart**](docs/RecognizeApi.md#recognizeMultipart) | **POST** /barcode/recognize-multipart | Recognize barcode from file in request body using POST requests with parameters in multipart form.
182+
*ScanApi* | [**scan**](docs/ScanApi.md#scan) | **GET** /barcode/scan | Scan barcode from file on server using GET requests with parameter in query string.
183+
*ScanApi* | [**scanBase64**](docs/ScanApi.md#scanBase64) | **POST** /barcode/scan-body | Scan barcode from file in request body using POST requests with parameter in body in json or xml format.
184+
*ScanApi* | [**scanMultipart**](docs/ScanApi.md#scanMultipart) | **POST** /barcode/scan-multipart | Scan barcode from file in request body using POST requests with parameter in multipart form.
194185

195186
## Documentation for Models
196187

197188
- [ApiError](docs/ApiError.md)
198189
- [ApiErrorResponse](docs/ApiErrorResponse.md)
199-
- [AustralianPostParams](docs/AustralianPostParams.md)
200-
- [AutoSizeMode](docs/AutoSizeMode.md)
201-
- [AvailableGraphicsUnit](docs/AvailableGraphicsUnit.md)
202-
- [AztecEncodeMode](docs/AztecEncodeMode.md)
203-
- [AztecParams](docs/AztecParams.md)
204-
- [AztecSymbolMode](docs/AztecSymbolMode.md)
190+
- [BarcodeImageFormat](docs/BarcodeImageFormat.md)
191+
- [BarcodeImageParams](docs/BarcodeImageParams.md)
205192
- [BarcodeResponse](docs/BarcodeResponse.md)
206193
- [BarcodeResponseList](docs/BarcodeResponseList.md)
207-
- [BorderDashStyle](docs/BorderDashStyle.md)
208-
- [CaptionParams](docs/CaptionParams.md)
209-
- [ChecksumValidation](docs/ChecksumValidation.md)
210-
- [CodabarChecksumMode](docs/CodabarChecksumMode.md)
211-
- [CodabarParams](docs/CodabarParams.md)
212-
- [CodabarSymbol](docs/CodabarSymbol.md)
213-
- [CodablockParams](docs/CodablockParams.md)
214-
- [Code128Emulation](docs/Code128Emulation.md)
215-
- [Code128EncodeMode](docs/Code128EncodeMode.md)
216-
- [Code128Params](docs/Code128Params.md)
217-
- [Code16KParams](docs/Code16KParams.md)
218194
- [CodeLocation](docs/CodeLocation.md)
219-
- [CouponParams](docs/CouponParams.md)
220-
- [CustomerInformationInterpretingType](docs/CustomerInformationInterpretingType.md)
221-
- [DataBarParams](docs/DataBarParams.md)
222-
- [DataMatrixEccType](docs/DataMatrixEccType.md)
223-
- [DataMatrixEncodeMode](docs/DataMatrixEncodeMode.md)
224-
- [DataMatrixParams](docs/DataMatrixParams.md)
225-
- [DataMatrixVersion](docs/DataMatrixVersion.md)
226195
- [DecodeBarcodeType](docs/DecodeBarcodeType.md)
227-
- [DiscUsage](docs/DiscUsage.md)
228-
- [DotCodeEncodeMode](docs/DotCodeEncodeMode.md)
229-
- [DotCodeParams](docs/DotCodeParams.md)
230-
- [ECIEncodings](docs/ECIEncodings.md)
231-
- [EnableChecksum](docs/EnableChecksum.md)
232196
- [EncodeBarcodeType](docs/EncodeBarcodeType.md)
233-
- [Error](docs/Error.md)
234-
- [ErrorDetails](docs/ErrorDetails.md)
235-
- [FileVersions](docs/FileVersions.md)
236-
- [FilesList](docs/FilesList.md)
237-
- [FilesUploadResult](docs/FilesUploadResult.md)
238-
- [FontMode](docs/FontMode.md)
239-
- [FontParams](docs/FontParams.md)
240-
- [FontStyle](docs/FontStyle.md)
241-
- [GeneratorParams](docs/GeneratorParams.md)
242-
- [GeneratorParamsList](docs/GeneratorParamsList.md)
243-
- [HanXinEncodeMode](docs/HanXinEncodeMode.md)
244-
- [HanXinErrorLevel](docs/HanXinErrorLevel.md)
245-
- [HanXinParams](docs/HanXinParams.md)
246-
- [HanXinVersion](docs/HanXinVersion.md)
247-
- [ITF14BorderType](docs/ITF14BorderType.md)
248-
- [ITFParams](docs/ITFParams.md)
249-
- [MacroCharacter](docs/MacroCharacter.md)
250-
- [MaxiCodeEncodeMode](docs/MaxiCodeEncodeMode.md)
251-
- [MaxiCodeMode](docs/MaxiCodeMode.md)
252-
- [MaxiCodeParams](docs/MaxiCodeParams.md)
253-
- [ObjectExist](docs/ObjectExist.md)
254-
- [Padding](docs/Padding.md)
255-
- [PatchCodeParams](docs/PatchCodeParams.md)
256-
- [PatchFormat](docs/PatchFormat.md)
257-
- [Pdf417CompactionMode](docs/Pdf417CompactionMode.md)
258-
- [Pdf417ErrorLevel](docs/Pdf417ErrorLevel.md)
259-
- [Pdf417MacroTerminator](docs/Pdf417MacroTerminator.md)
260-
- [Pdf417Params](docs/Pdf417Params.md)
261-
- [PostalParams](docs/PostalParams.md)
262-
- [PresetType](docs/PresetType.md)
263-
- [QREncodeMode](docs/QREncodeMode.md)
264-
- [QREncodeType](docs/QREncodeType.md)
265-
- [QRErrorLevel](docs/QRErrorLevel.md)
266-
- [QRVersion](docs/QRVersion.md)
267-
- [QrParams](docs/QrParams.md)
268-
- [ReaderParams](docs/ReaderParams.md)
197+
- [EncodeData](docs/EncodeData.md)
198+
- [EncodeDataType](docs/EncodeDataType.md)
199+
- [GenerateParams](docs/GenerateParams.md)
200+
- [GraphicsUnit](docs/GraphicsUnit.md)
201+
- [RecognitionImageKind](docs/RecognitionImageKind.md)
202+
- [RecognitionMode](docs/RecognitionMode.md)
203+
- [RecognizeBase64Request](docs/RecognizeBase64Request.md)
269204
- [RegionPoint](docs/RegionPoint.md)
270-
- [ResultImageInfo](docs/ResultImageInfo.md)
271-
- [StorageExist](docs/StorageExist.md)
272-
- [StorageFile](docs/StorageFile.md)
273-
- [StructuredAppend](docs/StructuredAppend.md)
274-
- [TextAlignment](docs/TextAlignment.md)
275-
- [FileVersion](docs/FileVersion.md)
205+
- [ScanBase64Request](docs/ScanBase64Request.md)
276206

277207
## Documentation for Authorization
278208

@@ -282,7 +212,7 @@ Authentication schemes defined for the API:
282212

283213
- **Type**: OAuth
284214
- **Flow**: application
285-
- **Authorization URL**: <https://api.aspose.cloud/connect/token>
215+
- **Authorization URL**: <https://id.aspose.cloud/connect/token>
286216

287217
## Recommendation
288218

docs/ApiError.md

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11

2+
23
# ApiError
34

5+
Api Error.
6+
47
## Properties
5-
Name | Type | Description | Notes
6-
------------ | ------------- | ------------- | -------------
7-
**code** | **String** | | [optional]
8-
**message** | **String** | | [optional]
9-
**description** | **String** | | [optional]
10-
**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) | | [optional]
11-
**innerError** | [**ApiError**](ApiError.md) | | [optional]
8+
9+
| Name | Type | Description | Notes |
10+
|------------ | ------------- | ------------- | -------------|
11+
|**code** | **String** | Gets or sets api error code. | |
12+
|**message** | **String** | Gets or sets error message. | |
13+
|**description** | **String** | Gets or sets error description. | [optional] |
14+
|**dateTime** | **OffsetDateTime** | Gets or sets server datetime. | [optional] |
15+
|**innerError** | [**ApiError**](ApiError.md) | | [optional] |
1216

1317

1418

docs/ApiErrorResponse.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11

2+
23
# ApiErrorResponse
34

5+
ApiError Response
6+
47
## Properties
5-
Name | Type | Description | Notes
6-
------------ | ------------- | ------------- | -------------
7-
**requestId** | **String** | | [optional]
8-
**error** | [**ApiError**](ApiError.md) | | [optional]
8+
9+
| Name | Type | Description | Notes |
10+
|------------ | ------------- | ------------- | -------------|
11+
|**requestId** | **String** | Gets or sets request Id. | |
12+
|**error** | [**ApiError**](ApiError.md) | | |
913

1014

1115

docs/AustralianPostParams.md

-11
This file was deleted.

docs/AutoSizeMode.md

-14
This file was deleted.

docs/AztecEncodeMode.md

-14
This file was deleted.

0 commit comments

Comments
 (0)