Skip to content

Commit 11dbf0f

Browse files
authored
Release 23.7 (#61)
* Update version to 23.7.0 * New code generated from updated Swagger specification * Add @deprecated for deprecated parameters * Fixing warnings
1 parent ba310c8 commit 11dbf0f

40 files changed

Lines changed: 710 additions & 23 deletions

.github/workflows/maven.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ jobs:
2020
uses: actions/setup-java@v1
2121
with:
2222
java-version: 1.8
23+
24+
- name: Maven Compile
25+
run: mvn compile
26+
2327
- name: Test with Maven
2428
env:
2529
TEST_CONFIGURATION_ACCESS_TOKEN: ${{ secrets.TEST_CONFIGURATION_ACCESS_TOKEN }}

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@ all: format test
66
.PHONY: fix
77
fix:
88
./scripts/fix-region-point.bash
9+
./scripts/annotate-deprecated.bash
910

1011
.PHONY: format
1112
format:
1213
./scripts/format.bash
1314

15+
.PHONY: lint
16+
lint:
17+
./scripts/checkstyle.bash
18+
1419
.PHONY: test
1520
test:
1621
mvn test

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
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

77
- API version: 3.0
8-
- SDK version: 23.6.0
8+
- SDK version: 23.7.0
99

1010
## Demo applications
1111

@@ -68,7 +68,7 @@ Add this dependency to your project's POM:
6868
<dependency>
6969
<groupId>com.aspose</groupId>
7070
<artifactId>aspose-barcode-cloud</artifactId>
71-
<version>23.6.0</version>
71+
<version>23.7.0</version>
7272
<scope>compile</scope>
7373
</dependency>
7474
```
@@ -83,7 +83,7 @@ mvn clean package
8383

8484
Then manually install the following JARs:
8585

86-
- `target/aspose-barcode-cloud-23.6.0.jar`
86+
- `target/aspose-barcode-cloud-23.7.0.jar`
8787
- `target/lib/*.jar`
8888

8989
## Getting Started

checkstyle.xml

Lines changed: 382 additions & 0 deletions
Large diffs are not rendered by default.

docs/DataMatrixParams.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Name | Type | Description | Notes
66
------------ | ------------- | ------------- | -------------
77
**aspectRatio** | **Double** | Height/Width ratio of 2D BarCode module | [optional]
88
**textEncoding** | **String** | Encoding of codetext. | [optional]
9-
**columns** | **Integer** | Columns count. | [optional]
9+
**columns** | **Integer** | DEPRECATED: Will be replaced with &#39;DataMatrix.Version&#39; in the next release Columns count. | [optional]
1010
**dataMatrixEcc** | [**DataMatrixEccType**](DataMatrixEccType.md) | Datamatrix ECC type. Default value: DataMatrixEccType.Ecc200. | [optional]
1111
**dataMatrixEncodeMode** | [**DataMatrixEncodeMode**](DataMatrixEncodeMode.md) | Encode mode of Datamatrix barcode. Default value: DataMatrixEncodeMode.Auto. | [optional]
12-
**rows** | **Integer** | Rows count. | [optional]
12+
**rows** | **Integer** | DEPRECATED: Will be replaced with &#39;DataMatrix.Version&#39; in the next release Rows count. | [optional]
1313
**macroCharacters** | [**MacroCharacter**](MacroCharacter.md) | Macro Characters 05 and 06 values are used to obtain more compact encoding in special modes. Can be used only with DataMatrixEccType.Ecc200 or DataMatrixEccType.EccAuto. Cannot be used with EncodeTypes.GS1DataMatrix Default value: MacroCharacters.None. | [optional]
1414

1515

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>aspose-barcode-cloud</artifactId>
66
<packaging>jar</packaging>
77
<name>aspose-barcode-cloud</name>
8-
<version>23.6.0</version>
8+
<version>23.7.0</version>
99
<url>https://www.aspose.cloud</url>
1010
<description>Aspose.BarCode Cloud SDK for Java</description>
1111
<scm>

scripts/annotate-deprecated.bash

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
5+
SRC_DIR="$( cd "${SCRIPT_DIR}/../src/main" &> /dev/null && pwd )"
6+
7+
find "${SRC_DIR}" -name "*.java" -exec python "${SCRIPT_DIR}/annotate-deprecated.py" "{}" \;

scripts/annotate-deprecated.py

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
from __future__ import division, print_function
2+
3+
import argparse
4+
import re
5+
6+
JAVADOC_START_RE = re.compile(r"^\s*/\*\*$")
7+
COMMENT_RE = re.compile(r"^\s*\*")
8+
DEPRECATED_RE = re.compile(r"^\s*\*\s+DEPRECATED:\s*(?P<message>.+)$")
9+
10+
11+
def main(input_file):
12+
filename = input_file.name
13+
content = [line.rstrip() for line in input_file.readlines()]
14+
input_file.close()
15+
16+
with open(filename, "wt") as result:
17+
javadoc_started = False
18+
obsolete_message = None
19+
20+
for line in content:
21+
deprecated_match = DEPRECATED_RE.match(line)
22+
if javadoc_started and deprecated_match:
23+
# deprecation message found
24+
obsolete_message = "@Deprecated()"
25+
26+
if javadoc_started and not COMMENT_RE.match(line):
27+
# comment section ended
28+
javadoc_started = False
29+
if obsolete_message:
30+
if not line.lstrip().startswith("@Deprecated"):
31+
result.write(obsolete_message + "\n")
32+
obsolete_message = None
33+
34+
result.write(line + "\n")
35+
continue
36+
37+
if JAVADOC_START_RE.match(line):
38+
# comment section started
39+
javadoc_started = True
40+
41+
result.write(line + "\n")
42+
43+
44+
def parse_args():
45+
parser = argparse.ArgumentParser()
46+
parser.add_argument("input_file", type=argparse.FileType("rt"))
47+
args = parser.parse_args()
48+
return vars(args)
49+
50+
51+
if __name__ == "__main__":
52+
main(**parse_args())

scripts/check-badges.bash

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ readme_file=$1
55

66
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
77

8-
pushd "${SCRIPT_DIR}/.."
8+
pushd "${SCRIPT_DIR}/.." >/dev/null
99

10-
(grep -oP '[^/]+\.yml(?=/badge.svg)' "${readme_file}" || (echo "No badges in ${readme_file}" ; exit 1)) | while read -r workflow_file; do
10+
(grep -oP '[^/]+\.yml(?=/badge.svg)' "${readme_file}" || (>&2 echo "No badges in ${readme_file}" ; exit 1)) | while read -r workflow_file; do
1111
path_to_workflow=".github/workflows/${workflow_file}"
1212
if [ ! -e "${path_to_workflow}" ]
1313
then
14-
echo "Error, workflow does not exist \"${path_to_workflow}\""
14+
>&2 echo "Error, workflow does not exist \"${path_to_workflow}\""
1515
exit 1
1616
fi
1717
done
1818

1919
(grep -oP '[^/]+\.yml/badge.svg(?!\?branch=main)' "${readme_file}" || echo ) | while read -r badge_without_branch; do
2020
if [ -z "${badge_without_branch}" ]; then continue; fi
21-
echo "Badge without branch \"${badge_without_branch}\""
21+
>&2 echo "Badge without branch \"${badge_without_branch}\""
2222
exit 1
2323
done
2424

25-
popd
25+
popd >/dev/null

scripts/checkstyle.bash

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
#
3+
# Format java code using https://github.com/checkstyle/checkstyle/releases
4+
#
5+
set -euo pipefail
6+
7+
CHECKSTYLE_TOOL="tools/checkstyle-10.12.1-all.jar"
8+
9+
java -jar "${CHECKSTYLE_TOOL}" -c=checkstyle.xml src/main/java/com/aspose/barcode/cloud

0 commit comments

Comments
 (0)