Skip to content

Commit b96d2f5

Browse files
author
Fast Reports
committed
sync 2024-02-07
1 parent f413303 commit b96d2f5

21 files changed

+262
-705
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Add this dependency to your project's POM:
3434
<dependency>
3535
<groupId>cloud.fastreport.sdk</groupId>
3636
<artifactId>fastreport-cloud-sdk</artifactId>
37-
<version>2024.1.15</version>
37+
<version>2024.1.16</version>
3838
<scope>compile</scope>
3939
</dependency>
4040
```
@@ -44,7 +44,7 @@ Add this dependency to your project's POM:
4444
Add this dependency to your project's build file:
4545

4646
```groovy
47-
compile "cloud.fastreport.sdk:fastreport-cloud-sdk:2024.1.15"
47+
compile "cloud.fastreport.sdk:fastreport-cloud-sdk:2024.1.16"
4848
```
4949

5050
### Others
@@ -57,7 +57,7 @@ mvn clean package
5757

5858
Then manually install the following JARs:
5959

60-
- `target/fastreport-cloud-sdk-2024.1.15.jar`
60+
- `target/fastreport-cloud-sdk-2024.1.16.jar`
6161
- `target/lib/*.jar`
6262

6363
## Getting Started

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024.1.15
1+
2024.1.16

api/openapi.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14394,6 +14394,14 @@ components:
1439414394
x-typeName: FastReport.Cloud.Base.Enums.EntityType
1439514395
EntityVM:
1439614396
additionalProperties: false
14397+
discriminator:
14398+
mapping:
14399+
ExportVM: '#/components/schemas/ExportVM'
14400+
EntityVM: '#/components/schemas/EntityVM'
14401+
FileVM: '#/components/schemas/FileVM'
14402+
ReportVM: '#/components/schemas/ReportVM'
14403+
TemplateVM: '#/components/schemas/TemplateVM'
14404+
propertyName: $t
1439714405
properties:
1439814406
id:
1439914407
nullable: true
@@ -14410,6 +14418,10 @@ components:
1441014418
editorUserId:
1441114419
nullable: true
1441214420
type: string
14421+
$t:
14422+
type: string
14423+
required:
14424+
- $t
1441314425
type: object
1441414426
ExportCreateAdminVM:
1441514427
additionalProperties: false
@@ -14959,7 +14971,15 @@ components:
1495914971
additionalProperties: false
1496014972
allOf:
1496114973
- $ref: '#/components/schemas/EntityVM'
14974+
discriminator:
14975+
mapping:
14976+
ExportVM: '#/components/schemas/ExportVM'
14977+
FileVM: '#/components/schemas/FileVM'
14978+
ReportVM: '#/components/schemas/ReportVM'
14979+
TemplateVM: '#/components/schemas/TemplateVM'
14980+
propertyName: $t
1496214981
example:
14982+
$t: $t
1496314983
statusReason: null
1496414984
size: 0
1496514985
isDeleted: true
@@ -15006,6 +15026,10 @@ components:
1500615026
type: string
1500715027
isDeleted:
1500815028
type: boolean
15029+
$t:
15030+
type: string
15031+
required:
15032+
- $t
1500915033
type: object
1501015034
FileVMFilesVMBase:
1501115035
additionalProperties: false

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'idea'
22
apply plugin: 'eclipse'
33

44
group = 'cloud.fastreport.sdk'
5-
version = '2024.1.15'
5+
version = '2024.1.16'
66

77
buildscript {
88
repositories {

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
22
settings(
33
organization := "cloud.fastreport.sdk",
44
name := "fastreport-cloud-sdk",
5-
version := "2024.1.15",
5+
version := "2024.1.16",
66
scalaVersion := "2.11.4",
77
scalacOptions ++= Seq("-feature"),
88
javacOptions in compile ++= Seq("-Xlint:deprecation"),

docs/EntityVM.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
|**creatorUserId** | **String** | | [optional] |
1313
|**editedTime** | **OffsetDateTime** | | [optional] |
1414
|**editorUserId** | **String** | | [optional] |
15+
|**$t** | **String** | | |
1516

1617

1718

docs/ExportVM.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
|**format** | **ExportFormat** | | [optional] |
1111
|**reportId** | **String** | | [optional] |
1212
|**templateId** | **String** | | [optional] |
13-
|**id** | **String** | | [optional] |
14-
|**createdTime** | **OffsetDateTime** | | [optional] |
15-
|**creatorUserId** | **String** | | [optional] |
16-
|**editedTime** | **OffsetDateTime** | | [optional] |
17-
|**editorUserId** | **String** | | [optional] |
1813

1914

2015

docs/FileVM.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
|**statusReason** | **FileStatusReason** | | [optional] |
1919
|**errorMessage** | **String** | | [optional] |
2020
|**isDeleted** | **Boolean** | | [optional] |
21-
|**id** | **String** | | [optional] |
22-
|**createdTime** | **OffsetDateTime** | | [optional] |
23-
|**creatorUserId** | **String** | | [optional] |
24-
|**editedTime** | **OffsetDateTime** | | [optional] |
25-
|**editorUserId** | **String** | | [optional] |
21+
|**$t** | **String** | | |
2622

2723

2824

docs/ReportVM.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
|------------ | ------------- | ------------- | -------------|
1010
|**templateId** | **String** | | [optional] |
1111
|**reportInfo** | [**ReportInfo**](ReportInfo.md) | | [optional] |
12-
|**id** | **String** | | [optional] |
13-
|**createdTime** | **OffsetDateTime** | | [optional] |
14-
|**creatorUserId** | **String** | | [optional] |
15-
|**editedTime** | **OffsetDateTime** | | [optional] |
16-
|**editorUserId** | **String** | | [optional] |
1712

1813

1914

docs/TemplateVM.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
| Name | Type | Description | Notes |
99
|------------ | ------------- | ------------- | -------------|
1010
|**reportInfo** | [**ReportInfo**](ReportInfo.md) | | [optional] |
11-
|**id** | **String** | | [optional] |
12-
|**createdTime** | **OffsetDateTime** | | [optional] |
13-
|**creatorUserId** | **String** | | [optional] |
14-
|**editedTime** | **OffsetDateTime** | | [optional] |
15-
|**editorUserId** | **String** | | [optional] |
1611

1712

1813

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>fastreport-cloud-sdk</artifactId>
66
<packaging>jar</packaging>
77
<name>fastreport-cloud-sdk</name>
8-
<version>2024.1.15</version>
8+
<version>2024.1.16</version>
99
<url>https://github.com/FastReports/FastReport-Cloud-Java</url>
1010
<description>FastReport Cloud SDK</description>
1111
<scm>

src/main/java/cloud/fastreport/model/EntityVM.java

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@
1515

1616
import java.util.Objects;
1717
import java.util.Arrays;
18+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
1819
import com.fasterxml.jackson.annotation.JsonInclude;
1920
import com.fasterxml.jackson.annotation.JsonProperty;
2021
import com.fasterxml.jackson.annotation.JsonCreator;
22+
import com.fasterxml.jackson.annotation.JsonSubTypes;
23+
import com.fasterxml.jackson.annotation.JsonTypeInfo;
2124
import com.fasterxml.jackson.annotation.JsonTypeName;
2225
import com.fasterxml.jackson.annotation.JsonValue;
2326
import java.time.OffsetDateTime;
@@ -36,9 +39,23 @@
3639
EntityVM.JSON_PROPERTY_CREATED_TIME,
3740
EntityVM.JSON_PROPERTY_CREATOR_USER_ID,
3841
EntityVM.JSON_PROPERTY_EDITED_TIME,
39-
EntityVM.JSON_PROPERTY_EDITOR_USER_ID
42+
EntityVM.JSON_PROPERTY_EDITOR_USER_ID,
43+
EntityVM.JSON_PROPERTY_$_T
4044
})
4145
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
46+
@JsonIgnoreProperties(
47+
value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization
48+
allowSetters = true // allows the $t to be set during deserialization
49+
)
50+
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true)
51+
@JsonSubTypes({
52+
@JsonSubTypes.Type(value = EntityVM.class, name = "EntityVM"),
53+
@JsonSubTypes.Type(value = ExportVM.class, name = "ExportVM"),
54+
@JsonSubTypes.Type(value = FileVM.class, name = "FileVM"),
55+
@JsonSubTypes.Type(value = ReportVM.class, name = "ReportVM"),
56+
@JsonSubTypes.Type(value = TemplateVM.class, name = "TemplateVM"),
57+
})
58+
4259
public class EntityVM {
4360
public static final String JSON_PROPERTY_ID = "id";
4461
private JsonNullable<String> id = JsonNullable.<String>undefined();
@@ -55,6 +72,9 @@ public class EntityVM {
5572
public static final String JSON_PROPERTY_EDITOR_USER_ID = "editorUserId";
5673
private JsonNullable<String> editorUserId = JsonNullable.<String>undefined();
5774

75+
public static final String JSON_PROPERTY_$_T = "$t";
76+
protected String $t;
77+
5878
public EntityVM() {
5979
}
6080

@@ -211,6 +231,32 @@ public void setEditorUserId(String editorUserId) {
211231
this.editorUserId = JsonNullable.<String>of(editorUserId);
212232
}
213233

234+
235+
public EntityVM $t(String $t) {
236+
237+
this.$t = $t;
238+
return this;
239+
}
240+
241+
/**
242+
* Get $t
243+
* @return $t
244+
**/
245+
@javax.annotation.Nonnull
246+
@JsonProperty(JSON_PROPERTY_$_T)
247+
@JsonInclude(value = JsonInclude.Include.ALWAYS)
248+
249+
public String get$T() {
250+
return $t;
251+
}
252+
253+
254+
@JsonProperty(JSON_PROPERTY_$_T)
255+
@JsonInclude(value = JsonInclude.Include.ALWAYS)
256+
public void set$T(String $t) {
257+
this.$t = $t;
258+
}
259+
214260
@Override
215261
public boolean equals(Object o) {
216262
if (this == o) {
@@ -224,7 +270,8 @@ public boolean equals(Object o) {
224270
Objects.equals(this.createdTime, entityVM.createdTime) &&
225271
equalsNullable(this.creatorUserId, entityVM.creatorUserId) &&
226272
Objects.equals(this.editedTime, entityVM.editedTime) &&
227-
equalsNullable(this.editorUserId, entityVM.editorUserId);
273+
equalsNullable(this.editorUserId, entityVM.editorUserId) &&
274+
Objects.equals(this.$t, entityVM.$t);
228275
}
229276

230277
private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
@@ -233,7 +280,7 @@ private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b)
233280

234281
@Override
235282
public int hashCode() {
236-
return Objects.hash(hashCodeNullable(id), createdTime, hashCodeNullable(creatorUserId), editedTime, hashCodeNullable(editorUserId));
283+
return Objects.hash(hashCodeNullable(id), createdTime, hashCodeNullable(creatorUserId), editedTime, hashCodeNullable(editorUserId), $t);
237284
}
238285

239286
private static <T> int hashCodeNullable(JsonNullable<T> a) {
@@ -252,6 +299,7 @@ public String toString() {
252299
sb.append(" creatorUserId: ").append(toIndentedString(creatorUserId)).append("\n");
253300
sb.append(" editedTime: ").append(toIndentedString(editedTime)).append("\n");
254301
sb.append(" editorUserId: ").append(toIndentedString(editorUserId)).append("\n");
302+
sb.append(" $t: ").append(toIndentedString($t)).append("\n");
255303
sb.append("}");
256304
return sb.toString();
257305
}

0 commit comments

Comments
 (0)