Skip to content

Commit ef589cf

Browse files
authored
Update Java dependencies (#112)
* Remove swagger-annotations and jakarta.annotation imports from generated code * Bump gson to 2.14.0 * Refresh barcode test fixture images * Remove unnecessary gson-fire
1 parent 35dda5d commit ef589cf

18 files changed

Lines changed: 2 additions & 134 deletions

pom.xml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,6 @@
200200
</build>
201201

202202
<dependencies>
203-
<dependency>
204-
<groupId>io.swagger</groupId>
205-
<artifactId>swagger-annotations</artifactId>
206-
<version>${swagger-core-version}</version>
207-
</dependency>
208203
<dependency>
209204
<groupId>com.squareup.okhttp3</groupId>
210205
<artifactId>okhttp</artifactId>
@@ -220,16 +215,6 @@
220215
<artifactId>gson</artifactId>
221216
<version>${gson-version}</version>
222217
</dependency>
223-
<dependency>
224-
<groupId>io.gsonfire</groupId>
225-
<artifactId>gson-fire</artifactId>
226-
<version>${gson-fire-version}</version>
227-
</dependency>
228-
<dependency>
229-
<groupId>jakarta.annotation</groupId>
230-
<artifactId>jakarta.annotation-api</artifactId>
231-
<version>3.0.0</version>
232-
</dependency>
233218
<!-- test dependencies -->
234219
<dependency>
235220
<groupId>junit</groupId>
@@ -242,9 +227,7 @@
242227
<java.version>11</java.version>
243228
<maven.compiler.source>${java.version}</maven.compiler.source>
244229
<maven.compiler.target>${java.version}</maven.compiler.target>
245-
<gson-fire-version>1.9.0</gson-fire-version>
246-
<gson-version>2.13.2</gson-version>
247-
<swagger-core-version>1.6.16</swagger-core-version>
230+
<gson-version>2.14.0</gson-version>
248231
<okhttp-version>5.3.2</okhttp-version>
249232
<maven-plugin-version>1.0.0</maven-plugin-version>
250233
<junit-version>4.13.2</junit-version>

src/main/java/com/aspose/barcode/cloud/JSON.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import com.google.gson.stream.JsonToken;
1010
import com.google.gson.stream.JsonWriter;
1111

12-
import io.gsonfire.GsonFireBuilder;
13-
1412
import okio.ByteString;
1513

1614
import java.io.IOException;
@@ -28,8 +26,7 @@ public class JSON {
2826
private Gson gson;
2927

3028
private static GsonBuilder createGson() {
31-
GsonFireBuilder fireBuilder = new GsonFireBuilder();
32-
GsonBuilder builder = fireBuilder.createGsonBuilder();
29+
GsonBuilder builder = new GsonBuilder();
3330
builder.setPrettyPrinting().create();
3431
return builder;
3532
}

src/main/java/com/aspose/barcode/cloud/ServerConfiguration.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
import java.util.Map;
2929

3030
/** Representing a Server configuration. */
31-
@jakarta.annotation.Generated(
32-
value = "org.openapitools.codegen.languages.JavaClientCodegen",
33-
comments = "Generator version: 7.8.0")
3431
public class ServerConfiguration {
3532
public String url;
3633
public String description;

src/main/java/com/aspose/barcode/cloud/ServerVariable.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
import java.util.HashSet;
2929

3030
/** Representing a Server Variable for server URL template substitution. */
31-
@jakarta.annotation.Generated(
32-
value = "org.openapitools.codegen.languages.JavaClientCodegen",
33-
comments = "Generator version: 7.8.0")
3431
public class ServerVariable {
3532
public String description;
3633
public String defaultValue;

src/main/java/com/aspose/barcode/cloud/model/AbstractOpenApiSchema.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
import java.util.Objects;
3030

3131
/** Abstract class for oneOf,anyOf schemas defined in OpenAPI spec */
32-
@jakarta.annotation.Generated(
33-
value = "org.openapitools.codegen.languages.JavaClientCodegen",
34-
comments = "Generator version: 7.8.0")
3532
public abstract class AbstractOpenApiSchema {
3633

3734
// store the actual instance of the schema/object

src/main/java/com/aspose/barcode/cloud/model/ApiError.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@
22

33
import com.google.gson.annotations.SerializedName;
44

5-
import io.swagger.annotations.ApiModel;
6-
import io.swagger.annotations.ApiModelProperty;
7-
85
import java.time.OffsetDateTime;
96
import java.util.Objects;
107

118
/** Api Error. */
12-
@ApiModel(description = "Api Error.")
13-
@jakarta.annotation.Generated(
14-
value = "org.openapitools.codegen.languages.JavaClientCodegen",
15-
comments = "Generator version: 7.8.0")
169
public class ApiError {
1710
@SerializedName(value = "code")
1811
private String code;
@@ -45,7 +38,6 @@ public ApiError(String code, String message) {
4538
*
4639
* @return code
4740
*/
48-
@ApiModelProperty(required = true, value = "code")
4941
public String getCode() {
5042
return code;
5143
}
@@ -59,7 +51,6 @@ public void setCode(String code) {
5951
*
6052
* @return message
6153
*/
62-
@ApiModelProperty(required = true, value = "message")
6354
public String getMessage() {
6455
return message;
6556
}
@@ -73,7 +64,6 @@ public void setMessage(String message) {
7364
*
7465
* @return description
7566
*/
76-
@ApiModelProperty(value = "description")
7767
public String getDescription() {
7868
return description;
7969
}
@@ -87,7 +77,6 @@ public void setDescription(String description) {
8777
*
8878
* @return dateTime
8979
*/
90-
@ApiModelProperty(value = "dateTime")
9180
public OffsetDateTime getDateTime() {
9281
return dateTime;
9382
}
@@ -101,7 +90,6 @@ public void setDateTime(OffsetDateTime dateTime) {
10190
*
10291
* @return innerError
10392
*/
104-
@ApiModelProperty(value = "innerError")
10593
public ApiError getInnerError() {
10694
return innerError;
10795
}

src/main/java/com/aspose/barcode/cloud/model/ApiErrorResponse.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,9 @@
22

33
import com.google.gson.annotations.SerializedName;
44

5-
import io.swagger.annotations.ApiModel;
6-
import io.swagger.annotations.ApiModelProperty;
7-
85
import java.util.Objects;
96

107
/** ApiError Response */
11-
@ApiModel(description = "ApiError Response")
12-
@jakarta.annotation.Generated(
13-
value = "org.openapitools.codegen.languages.JavaClientCodegen",
14-
comments = "Generator version: 7.8.0")
158
public class ApiErrorResponse {
169
@SerializedName(value = "requestId")
1710
private String requestId;
@@ -35,7 +28,6 @@ public ApiErrorResponse(String requestId, ApiError error) {
3528
*
3629
* @return requestId
3730
*/
38-
@ApiModelProperty(required = true, value = "requestId")
3931
public String getRequestId() {
4032
return requestId;
4133
}
@@ -49,7 +41,6 @@ public void setRequestId(String requestId) {
4941
*
5042
* @return error
5143
*/
52-
@ApiModelProperty(required = true, value = "error")
5344
public ApiError getError() {
5445
return error;
5546
}

src/main/java/com/aspose/barcode/cloud/model/BarcodeImageParams.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,9 @@
22

33
import com.google.gson.annotations.SerializedName;
44

5-
import io.swagger.annotations.ApiModel;
6-
import io.swagger.annotations.ApiModelProperty;
7-
85
import java.util.Objects;
96

107
/** Barcode image optional parameters */
11-
@ApiModel(description = "Barcode image optional parameters")
12-
@jakarta.annotation.Generated(
13-
value = "org.openapitools.codegen.languages.JavaClientCodegen",
14-
comments = "Generator version: 7.8.0")
158
public class BarcodeImageParams {
169
@SerializedName(value = "imageFormat")
1710
private BarcodeImageFormat imageFormat;
@@ -45,7 +38,6 @@ public class BarcodeImageParams {
4538
*
4639
* @return imageFormat
4740
*/
48-
@ApiModelProperty(value = "imageFormat")
4941
public BarcodeImageFormat getImageFormat() {
5042
return imageFormat;
5143
}
@@ -59,7 +51,6 @@ public void setImageFormat(BarcodeImageFormat imageFormat) {
5951
*
6052
* @return textLocation
6153
*/
62-
@ApiModelProperty(value = "textLocation")
6354
public CodeLocation getTextLocation() {
6455
return textLocation;
6556
}
@@ -75,7 +66,6 @@ public void setTextLocation(CodeLocation textLocation) {
7566
*
7667
* @return foregroundColor
7768
*/
78-
@ApiModelProperty(value = "foregroundColor")
7969
public String getForegroundColor() {
8070
return foregroundColor;
8171
}
@@ -91,7 +81,6 @@ public void setForegroundColor(String foregroundColor) {
9181
*
9282
* @return backgroundColor
9383
*/
94-
@ApiModelProperty(value = "backgroundColor")
9584
public String getBackgroundColor() {
9685
return backgroundColor;
9786
}
@@ -105,7 +94,6 @@ public void setBackgroundColor(String backgroundColor) {
10594
*
10695
* @return units
10796
*/
108-
@ApiModelProperty(value = "units")
10997
public GraphicsUnit getUnits() {
11098
return units;
11199
}
@@ -120,7 +108,6 @@ public void setUnits(GraphicsUnit units) {
120108
*
121109
* @return resolution
122110
*/
123-
@ApiModelProperty(example = "96", value = "resolution")
124111
public Float getResolution() {
125112
return resolution;
126113
}
@@ -134,7 +121,6 @@ public void setResolution(Float resolution) {
134121
*
135122
* @return imageHeight
136123
*/
137-
@ApiModelProperty(example = "200", value = "imageHeight")
138124
public Float getImageHeight() {
139125
return imageHeight;
140126
}
@@ -148,7 +134,6 @@ public void setImageHeight(Float imageHeight) {
148134
*
149135
* @return imageWidth
150136
*/
151-
@ApiModelProperty(example = "200", value = "imageWidth")
152137
public Float getImageWidth() {
153138
return imageWidth;
154139
}
@@ -164,7 +149,6 @@ public void setImageWidth(Float imageWidth) {
164149
*
165150
* @return rotationAngle
166151
*/
167-
@ApiModelProperty(value = "rotationAngle")
168152
public Integer getRotationAngle() {
169153
return rotationAngle;
170154
}

src/main/java/com/aspose/barcode/cloud/model/BarcodeResponse.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@
22

33
import com.google.gson.annotations.SerializedName;
44

5-
import io.swagger.annotations.ApiModel;
6-
import io.swagger.annotations.ApiModelProperty;
7-
85
import java.util.List;
96
import java.util.Objects;
107

118
/** Represents information about barcode. */
12-
@ApiModel(description = "Represents information about barcode.")
13-
@jakarta.annotation.Generated(
14-
value = "org.openapitools.codegen.languages.JavaClientCodegen",
15-
comments = "Generator version: 7.8.0")
169
public class BarcodeResponse {
1710
@SerializedName(value = "barcodeValue")
1811
private String barcodeValue;
@@ -31,7 +24,6 @@ public class BarcodeResponse {
3124
*
3225
* @return barcodeValue
3326
*/
34-
@ApiModelProperty(value = "barcodeValue")
3527
public String getBarcodeValue() {
3628
return barcodeValue;
3729
}
@@ -45,7 +37,6 @@ public void setBarcodeValue(String barcodeValue) {
4537
*
4638
* @return type
4739
*/
48-
@ApiModelProperty(value = "type")
4940
public String getType() {
5041
return type;
5142
}
@@ -59,7 +50,6 @@ public void setType(String type) {
5950
*
6051
* @return region
6152
*/
62-
@ApiModelProperty(value = "region")
6353
public List<RegionPoint> getRegion() {
6454
return region;
6555
}
@@ -73,7 +63,6 @@ public void setRegion(List<RegionPoint> region) {
7363
*
7464
* @return checksum
7565
*/
76-
@ApiModelProperty(value = "checksum")
7766
public String getChecksum() {
7867
return checksum;
7968
}

src/main/java/com/aspose/barcode/cloud/model/BarcodeResponseList.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@
22

33
import com.google.gson.annotations.SerializedName;
44

5-
import io.swagger.annotations.ApiModel;
6-
import io.swagger.annotations.ApiModelProperty;
7-
85
import java.util.List;
96
import java.util.Objects;
107

118
/** Represents information about barcode list. */
12-
@ApiModel(description = "Represents information about barcode list.")
13-
@jakarta.annotation.Generated(
14-
value = "org.openapitools.codegen.languages.JavaClientCodegen",
15-
comments = "Generator version: 7.8.0")
169
public class BarcodeResponseList {
1710
@SerializedName(value = "barcodes")
1811
private List<BarcodeResponse> barcodes;
@@ -31,7 +24,6 @@ public BarcodeResponseList(List<BarcodeResponse> barcodes) {
3124
*
3225
* @return barcodes
3326
*/
34-
@ApiModelProperty(required = true, value = "barcodes")
3527
public List<BarcodeResponse> getBarcodes() {
3628
return barcodes;
3729
}

0 commit comments

Comments
 (0)