Skip to content

Commit 64314d7

Browse files
ViacheslavKlimovViacheslavKlimov
committed
Merge branch 'master' of github.com:thingsboard/thingsboard-java-client into auto/update-ce-client
2 parents e761cd7 + 00e6b5b commit 64314d7

325 files changed

Lines changed: 27322 additions & 15579 deletions

File tree

Some content is hidden

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

‎ce/docs/TbResource.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ A JSON value representing the Resource.
2424
| **preview** | **String** | | [optional] |
2525
| **name** | **String** | | [optional] [readonly] |
2626
| **_public** | **Boolean** | | [optional] |
27-
| **link** | **String** | | [optional] [readonly] |
2827
| **publicLink** | **String** | | [optional] [readonly] |
28+
| **link** | **String** | | [optional] [readonly] |
2929

3030

3131

‎ce/docs/TbResourceInfo.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ A JSON value representing the Resource Info.
2222
| **descriptor** | **com.fasterxml.jackson.databind.JsonNode** | Resource descriptor. | [optional] |
2323
| **name** | **String** | | [optional] [readonly] |
2424
| **_public** | **Boolean** | | [optional] |
25-
| **link** | **String** | | [optional] [readonly] |
2625
| **publicLink** | **String** | | [optional] [readonly] |
26+
| **link** | **String** | | [optional] [readonly] |
2727

2828

2929

‎ce/src/main/java/org/thingsboard/client/model/TbResource.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
TbResource.JSON_PROPERTY_PREVIEW,
5555
TbResource.JSON_PROPERTY_NAME,
5656
TbResource.JSON_PROPERTY_PUBLIC,
57-
TbResource.JSON_PROPERTY_LINK,
58-
TbResource.JSON_PROPERTY_PUBLIC_LINK
57+
TbResource.JSON_PROPERTY_PUBLIC_LINK,
58+
TbResource.JSON_PROPERTY_LINK
5959
})
6060
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0")
6161
public class TbResource {
@@ -119,14 +119,14 @@ public class TbResource {
119119
@javax.annotation.Nullable
120120
private Boolean _public;
121121

122-
public static final String JSON_PROPERTY_LINK = "link";
123-
@javax.annotation.Nullable
124-
private String link;
125-
126122
public static final String JSON_PROPERTY_PUBLIC_LINK = "publicLink";
127123
@javax.annotation.Nullable
128124
private String publicLink;
129125

126+
public static final String JSON_PROPERTY_LINK = "link";
127+
@javax.annotation.Nullable
128+
private String link;
129+
130130
public TbResource() {
131131
}
132132

@@ -136,16 +136,16 @@ public TbResource(
136136
@JsonProperty(JSON_PROPERTY_TENANT_ID) TenantId tenantId,
137137
@JsonProperty(JSON_PROPERTY_ETAG) String etag,
138138
@JsonProperty(JSON_PROPERTY_NAME) String name,
139-
@JsonProperty(JSON_PROPERTY_LINK) String link,
140-
@JsonProperty(JSON_PROPERTY_PUBLIC_LINK) String publicLink
139+
@JsonProperty(JSON_PROPERTY_PUBLIC_LINK) String publicLink,
140+
@JsonProperty(JSON_PROPERTY_LINK) String link
141141
) {
142142
this();
143143
this.createdTime = createdTime;
144144
this.tenantId = tenantId;
145145
this.etag = etag;
146146
this.name = name;
147-
this.link = link;
148147
this.publicLink = publicLink;
148+
this.link = link;
149149
}
150150

151151
public TbResource id(@javax.annotation.Nullable TbResourceId id) {
@@ -469,28 +469,28 @@ public void setPublic(@javax.annotation.Nullable Boolean _public) {
469469

470470

471471
/**
472-
* Get link
473-
* @return link
472+
* Get publicLink
473+
* @return publicLink
474474
*/
475475
@javax.annotation.Nullable
476-
@JsonProperty(value = JSON_PROPERTY_LINK, required = false)
476+
@JsonProperty(value = JSON_PROPERTY_PUBLIC_LINK, required = false)
477477
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
478-
public String getLink() {
479-
return link;
478+
public String getPublicLink() {
479+
return publicLink;
480480
}
481481

482482

483483

484484

485485
/**
486-
* Get publicLink
487-
* @return publicLink
486+
* Get link
487+
* @return link
488488
*/
489489
@javax.annotation.Nullable
490-
@JsonProperty(value = JSON_PROPERTY_PUBLIC_LINK, required = false)
490+
@JsonProperty(value = JSON_PROPERTY_LINK, required = false)
491491
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
492-
public String getPublicLink() {
493-
return publicLink;
492+
public String getLink() {
493+
return link;
494494
}
495495

496496

@@ -523,13 +523,13 @@ public boolean equals(Object o) {
523523
Objects.equals(this.preview, tbResource.preview) &&
524524
Objects.equals(this.name, tbResource.name) &&
525525
Objects.equals(this._public, tbResource._public) &&
526-
Objects.equals(this.link, tbResource.link) &&
527-
Objects.equals(this.publicLink, tbResource.publicLink);
526+
Objects.equals(this.publicLink, tbResource.publicLink) &&
527+
Objects.equals(this.link, tbResource.link);
528528
}
529529

530530
@Override
531531
public int hashCode() {
532-
return Objects.hash(id, createdTime, tenantId, title, resourceType, resourceSubType, resourceKey, publicResourceKey, etag, fileName, descriptor, data, preview, name, _public, link, publicLink);
532+
return Objects.hash(id, createdTime, tenantId, title, resourceType, resourceSubType, resourceKey, publicResourceKey, etag, fileName, descriptor, data, preview, name, _public, publicLink, link);
533533
}
534534

535535
@Override
@@ -551,8 +551,8 @@ public String toString() {
551551
sb.append(" preview: ").append(toIndentedString(preview)).append("\n");
552552
sb.append(" name: ").append(toIndentedString(name)).append("\n");
553553
sb.append(" _public: ").append(toIndentedString(_public)).append("\n");
554-
sb.append(" link: ").append(toIndentedString(link)).append("\n");
555554
sb.append(" publicLink: ").append(toIndentedString(publicLink)).append("\n");
555+
sb.append(" link: ").append(toIndentedString(link)).append("\n");
556556
sb.append("}");
557557
return sb.toString();
558558
}
@@ -675,16 +675,16 @@ public String toUrlQueryString(String prefix) {
675675
joiner.add(String.format(java.util.Locale.ROOT, "%spublic%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPublic()))));
676676
}
677677

678-
// add `link` to the URL query string
679-
if (getLink() != null) {
680-
joiner.add(String.format(java.util.Locale.ROOT, "%slink%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLink()))));
681-
}
682-
683678
// add `publicLink` to the URL query string
684679
if (getPublicLink() != null) {
685680
joiner.add(String.format(java.util.Locale.ROOT, "%spublicLink%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPublicLink()))));
686681
}
687682

683+
// add `link` to the URL query string
684+
if (getLink() != null) {
685+
joiner.add(String.format(java.util.Locale.ROOT, "%slink%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLink()))));
686+
}
687+
688688
return joiner.toString();
689689
}
690690
}

‎ce/src/main/java/org/thingsboard/client/model/TbResourceInfo.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
TbResourceInfo.JSON_PROPERTY_DESCRIPTOR,
5353
TbResourceInfo.JSON_PROPERTY_NAME,
5454
TbResourceInfo.JSON_PROPERTY_PUBLIC,
55-
TbResourceInfo.JSON_PROPERTY_LINK,
56-
TbResourceInfo.JSON_PROPERTY_PUBLIC_LINK
55+
TbResourceInfo.JSON_PROPERTY_PUBLIC_LINK,
56+
TbResourceInfo.JSON_PROPERTY_LINK
5757
})
5858
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0")
5959
public class TbResourceInfo {
@@ -109,14 +109,14 @@ public class TbResourceInfo {
109109
@javax.annotation.Nullable
110110
private Boolean _public;
111111

112-
public static final String JSON_PROPERTY_LINK = "link";
113-
@javax.annotation.Nullable
114-
private String link;
115-
116112
public static final String JSON_PROPERTY_PUBLIC_LINK = "publicLink";
117113
@javax.annotation.Nullable
118114
private String publicLink;
119115

116+
public static final String JSON_PROPERTY_LINK = "link";
117+
@javax.annotation.Nullable
118+
private String link;
119+
120120
public TbResourceInfo() {
121121
}
122122

@@ -126,16 +126,16 @@ public TbResourceInfo(
126126
@JsonProperty(JSON_PROPERTY_TENANT_ID) TenantId tenantId,
127127
@JsonProperty(JSON_PROPERTY_ETAG) String etag,
128128
@JsonProperty(JSON_PROPERTY_NAME) String name,
129-
@JsonProperty(JSON_PROPERTY_LINK) String link,
130-
@JsonProperty(JSON_PROPERTY_PUBLIC_LINK) String publicLink
129+
@JsonProperty(JSON_PROPERTY_PUBLIC_LINK) String publicLink,
130+
@JsonProperty(JSON_PROPERTY_LINK) String link
131131
) {
132132
this();
133133
this.createdTime = createdTime;
134134
this.tenantId = tenantId;
135135
this.etag = etag;
136136
this.name = name;
137-
this.link = link;
138137
this.publicLink = publicLink;
138+
this.link = link;
139139
}
140140

141141
public TbResourceInfo id(@javax.annotation.Nullable TbResourceId id) {
@@ -411,28 +411,28 @@ public void setPublic(@javax.annotation.Nullable Boolean _public) {
411411

412412

413413
/**
414-
* Get link
415-
* @return link
414+
* Get publicLink
415+
* @return publicLink
416416
*/
417417
@javax.annotation.Nullable
418-
@JsonProperty(value = JSON_PROPERTY_LINK, required = false)
418+
@JsonProperty(value = JSON_PROPERTY_PUBLIC_LINK, required = false)
419419
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
420-
public String getLink() {
421-
return link;
420+
public String getPublicLink() {
421+
return publicLink;
422422
}
423423

424424

425425

426426

427427
/**
428-
* Get publicLink
429-
* @return publicLink
428+
* Get link
429+
* @return link
430430
*/
431431
@javax.annotation.Nullable
432-
@JsonProperty(value = JSON_PROPERTY_PUBLIC_LINK, required = false)
432+
@JsonProperty(value = JSON_PROPERTY_LINK, required = false)
433433
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
434-
public String getPublicLink() {
435-
return publicLink;
434+
public String getLink() {
435+
return link;
436436
}
437437

438438

@@ -463,13 +463,13 @@ public boolean equals(Object o) {
463463
Objects.equals(this.descriptor, tbResourceInfo.descriptor) &&
464464
Objects.equals(this.name, tbResourceInfo.name) &&
465465
Objects.equals(this._public, tbResourceInfo._public) &&
466-
Objects.equals(this.link, tbResourceInfo.link) &&
467-
Objects.equals(this.publicLink, tbResourceInfo.publicLink);
466+
Objects.equals(this.publicLink, tbResourceInfo.publicLink) &&
467+
Objects.equals(this.link, tbResourceInfo.link);
468468
}
469469

470470
@Override
471471
public int hashCode() {
472-
return Objects.hash(id, createdTime, tenantId, title, resourceType, resourceSubType, resourceKey, publicResourceKey, etag, fileName, descriptor, name, _public, link, publicLink);
472+
return Objects.hash(id, createdTime, tenantId, title, resourceType, resourceSubType, resourceKey, publicResourceKey, etag, fileName, descriptor, name, _public, publicLink, link);
473473
}
474474

475475
@Override
@@ -489,8 +489,8 @@ public String toString() {
489489
sb.append(" descriptor: ").append(toIndentedString(descriptor)).append("\n");
490490
sb.append(" name: ").append(toIndentedString(name)).append("\n");
491491
sb.append(" _public: ").append(toIndentedString(_public)).append("\n");
492-
sb.append(" link: ").append(toIndentedString(link)).append("\n");
493492
sb.append(" publicLink: ").append(toIndentedString(publicLink)).append("\n");
493+
sb.append(" link: ").append(toIndentedString(link)).append("\n");
494494
sb.append("}");
495495
return sb.toString();
496496
}
@@ -603,16 +603,16 @@ public String toUrlQueryString(String prefix) {
603603
joiner.add(String.format(java.util.Locale.ROOT, "%spublic%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPublic()))));
604604
}
605605

606-
// add `link` to the URL query string
607-
if (getLink() != null) {
608-
joiner.add(String.format(java.util.Locale.ROOT, "%slink%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLink()))));
609-
}
610-
611606
// add `publicLink` to the URL query string
612607
if (getPublicLink() != null) {
613608
joiner.add(String.format(java.util.Locale.ROOT, "%spublicLink%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getPublicLink()))));
614609
}
615610

611+
// add `link` to the URL query string
612+
if (getLink() != null) {
613+
joiner.add(String.format(java.util.Locale.ROOT, "%slink%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getLink()))));
614+
}
615+
616616
return joiner.toString();
617617
}
618618
}

0 commit comments

Comments
 (0)