Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pe/docs/Integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ A JSON value representing the integration.
| **secret** | **String** | String value used by the remote integrations. Remote integration uses this value along with the 'routingKey' for kind of security and validation to be able to connect to the platform using Grpc | [optional] |
| **_configuration** | **com.fasterxml.jackson.databind.JsonNode** | JSON object representing integration configuration. Each integration type has specific configuration with the connectivity parameters (like 'host' and 'port' for MQTT type or 'baseUrl' for HTTP based type, etc.) and other important parameters dependent on the integration type | |
| **additionalInfo** | **com.fasterxml.jackson.databind.JsonNode** | Additional parameters of the integration | [optional] |
| **edgeTemplate** | **Boolean** | Boolean flag that specifies that is regular or edge template integration | [optional] |
| **remote** | **Boolean** | Boolean flag to enable/disable the integration to be executed remotely. Remote integration is launched in a separate microservice. Local integration is executed by the platform core | [optional] |
| **edgeTemplate** | **Boolean** | Boolean flag that specifies that is regular or edge template integration | [optional] |



Expand Down
2 changes: 1 addition & 1 deletion pe/docs/IntegrationInfo.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
| **version** | **Long** | | [optional] |
| **status** | **Object** | | [optional] |
| **stats** | **Object** | | [optional] |
| **edgeTemplate** | **Boolean** | Boolean flag that specifies that is regular or edge template integration | [optional] |
| **remote** | **Boolean** | Boolean flag to enable/disable the integration to be executed remotely. Remote integration is launched in a separate microservice. Local integration is executed by the platform core | [optional] |
| **edgeTemplate** | **Boolean** | Boolean flag that specifies that is regular or edge template integration | [optional] |



Expand Down
2 changes: 1 addition & 1 deletion pe/docs/ReportTimeSeriesChartSettings.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
| **legendLabelColor** | **String** | | [optional] |
| **legendValueFont** | **Font** | | [optional] |
| **legendValueColor** | **String** | | [optional] |
| **xaxis** | **TimeSeriesChartXAxisSettings** | | [optional] |
| **yaxes** | **Map\<String, TimeSeriesChartYAxisSettings\>** | | [optional] |
| **xaxis** | **TimeSeriesChartXAxisSettings** | | [optional] |
| **thresholds** | **List\<TimeSeriesChartThreshold\>** | | [optional] |
| **grid** | **TimeSeriesChartGridSettings** | | [optional] |
| **yAxes** | **Map\<String, TimeSeriesChartYAxisSettings\>** | | [optional] |
Expand Down
22 changes: 11 additions & 11 deletions pe/spec/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -125480,13 +125480,13 @@
"$ref": "#/components/schemas/JsonNode",
"description": "Additional parameters of the integration"
},
"edgeTemplate": {
"type": "boolean",
"description": "Boolean flag that specifies that is regular or edge template integration"
},
"remote": {
"type": "boolean",
"description": "Boolean flag to enable/disable the integration to be executed remotely. Remote integration is launched in a separate microservice. Local integration is executed by the platform core"
},
"edgeTemplate": {
"type": "boolean",
"description": "Boolean flag that specifies that is regular or edge template integration"
}
},
"required": [
Expand Down Expand Up @@ -125582,13 +125582,13 @@
"stats": {
"$ref": "#/components/schemas/ArrayNode"
},
"edgeTemplate": {
"type": "boolean",
"description": "Boolean flag that specifies that is regular or edge template integration"
},
"remote": {
"type": "boolean",
"description": "Boolean flag to enable/disable the integration to be executed remotely. Remote integration is launched in a separate microservice. Local integration is executed by the platform core"
},
"edgeTemplate": {
"type": "boolean",
"description": "Boolean flag that specifies that is regular or edge template integration"
}
},
"required": [
Expand Down Expand Up @@ -133450,15 +133450,15 @@
"legendValueColor": {
"type": "string"
},
"xaxis": {
"$ref": "#/components/schemas/TimeSeriesChartXAxisSettings"
},
"yaxes": {
"type": "object",
"additionalProperties": {
"$ref": "#/components/schemas/TimeSeriesChartYAxisSettings"
}
},
"xaxis": {
"$ref": "#/components/schemas/TimeSeriesChartXAxisSettings"
},
"thresholds": {
"type": "array",
"items": {
Expand Down
70 changes: 35 additions & 35 deletions pe/src/main/java/org/thingsboard/client/model/Integration.java
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
Integration.JSON_PROPERTY_SECRET,
Integration.JSON_PROPERTY_CONFIGURATION,
Integration.JSON_PROPERTY_ADDITIONAL_INFO,
Integration.JSON_PROPERTY_EDGE_TEMPLATE,
Integration.JSON_PROPERTY_REMOTE
Integration.JSON_PROPERTY_REMOTE,
Integration.JSON_PROPERTY_EDGE_TEMPLATE
})
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0")
public class Integration {
Expand Down Expand Up @@ -125,14 +125,14 @@ public class Integration {
@javax.annotation.Nullable
private com.fasterxml.jackson.databind.JsonNode additionalInfo;

public static final String JSON_PROPERTY_EDGE_TEMPLATE = "edgeTemplate";
@javax.annotation.Nullable
private Boolean edgeTemplate;

public static final String JSON_PROPERTY_REMOTE = "remote";
@javax.annotation.Nullable
private Boolean remote;

public static final String JSON_PROPERTY_EDGE_TEMPLATE = "edgeTemplate";
@javax.annotation.Nullable
private Boolean edgeTemplate;

public Integration() {
}

Expand Down Expand Up @@ -512,51 +512,51 @@ public void setAdditionalInfo(@javax.annotation.Nullable com.fasterxml.jackson.d
}


public Integration edgeTemplate(@javax.annotation.Nullable Boolean edgeTemplate) {
this.edgeTemplate = edgeTemplate;
public Integration remote(@javax.annotation.Nullable Boolean remote) {
this.remote = remote;
return this;
}

/**
* Boolean flag that specifies that is regular or edge template integration
* @return edgeTemplate
* Boolean flag to enable/disable the integration to be executed remotely. Remote integration is launched in a separate microservice. Local integration is executed by the platform core
* @return remote
*/
@javax.annotation.Nullable
@JsonProperty(value = JSON_PROPERTY_EDGE_TEMPLATE, required = false)
@JsonProperty(value = JSON_PROPERTY_REMOTE, required = false)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Boolean getEdgeTemplate() {
return edgeTemplate;
public Boolean getRemote() {
return remote;
}


@JsonProperty(value = JSON_PROPERTY_EDGE_TEMPLATE, required = false)
@JsonProperty(value = JSON_PROPERTY_REMOTE, required = false)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public void setEdgeTemplate(@javax.annotation.Nullable Boolean edgeTemplate) {
this.edgeTemplate = edgeTemplate;
public void setRemote(@javax.annotation.Nullable Boolean remote) {
this.remote = remote;
}


public Integration remote(@javax.annotation.Nullable Boolean remote) {
this.remote = remote;
public Integration edgeTemplate(@javax.annotation.Nullable Boolean edgeTemplate) {
this.edgeTemplate = edgeTemplate;
return this;
}

/**
* Boolean flag to enable/disable the integration to be executed remotely. Remote integration is launched in a separate microservice. Local integration is executed by the platform core
* @return remote
* Boolean flag that specifies that is regular or edge template integration
* @return edgeTemplate
*/
@javax.annotation.Nullable
@JsonProperty(value = JSON_PROPERTY_REMOTE, required = false)
@JsonProperty(value = JSON_PROPERTY_EDGE_TEMPLATE, required = false)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Boolean getRemote() {
return remote;
public Boolean getEdgeTemplate() {
return edgeTemplate;
}


@JsonProperty(value = JSON_PROPERTY_REMOTE, required = false)
@JsonProperty(value = JSON_PROPERTY_EDGE_TEMPLATE, required = false)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public void setRemote(@javax.annotation.Nullable Boolean remote) {
this.remote = remote;
public void setEdgeTemplate(@javax.annotation.Nullable Boolean edgeTemplate) {
this.edgeTemplate = edgeTemplate;
}


Expand Down Expand Up @@ -588,13 +588,13 @@ public boolean equals(Object o) {
Objects.equals(this.secret, integration.secret) &&
Objects.equals(this._configuration, integration._configuration) &&
Objects.equals(this.additionalInfo, integration.additionalInfo) &&
Objects.equals(this.edgeTemplate, integration.edgeTemplate) &&
Objects.equals(this.remote, integration.remote);
Objects.equals(this.remote, integration.remote) &&
Objects.equals(this.edgeTemplate, integration.edgeTemplate);
}

@Override
public int hashCode() {
return Objects.hash(id, createdTime, tenantId, name, type, debugMode, debugSettings, enabled, allowCreateDevicesOrAssets, version, defaultConverterId, downlinkConverterId, routingKey, secret, _configuration, additionalInfo, edgeTemplate, remote);
return Objects.hash(id, createdTime, tenantId, name, type, debugMode, debugSettings, enabled, allowCreateDevicesOrAssets, version, defaultConverterId, downlinkConverterId, routingKey, secret, _configuration, additionalInfo, remote, edgeTemplate);
}

@Override
Expand All @@ -617,8 +617,8 @@ public String toString() {
sb.append(" secret: ").append(toIndentedString(secret)).append("\n");
sb.append(" _configuration: ").append(toIndentedString(_configuration)).append("\n");
sb.append(" additionalInfo: ").append(toIndentedString(additionalInfo)).append("\n");
sb.append(" edgeTemplate: ").append(toIndentedString(edgeTemplate)).append("\n");
sb.append(" remote: ").append(toIndentedString(remote)).append("\n");
sb.append(" edgeTemplate: ").append(toIndentedString(edgeTemplate)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down Expand Up @@ -746,16 +746,16 @@ public String toUrlQueryString(String prefix) {
joiner.add(String.format(java.util.Locale.ROOT, "%sadditionalInfo%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getAdditionalInfo()))));
}

// add `edgeTemplate` to the URL query string
if (getEdgeTemplate() != null) {
joiner.add(String.format(java.util.Locale.ROOT, "%sedgeTemplate%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEdgeTemplate()))));
}

// add `remote` to the URL query string
if (getRemote() != null) {
joiner.add(String.format(java.util.Locale.ROOT, "%sremote%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getRemote()))));
}

// add `edgeTemplate` to the URL query string
if (getEdgeTemplate() != null) {
joiner.add(String.format(java.util.Locale.ROOT, "%sedgeTemplate%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEdgeTemplate()))));
}

return joiner.toString();
}
}
Expand Down
70 changes: 35 additions & 35 deletions pe/src/main/java/org/thingsboard/client/model/IntegrationInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
IntegrationInfo.JSON_PROPERTY_VERSION,
IntegrationInfo.JSON_PROPERTY_STATUS,
IntegrationInfo.JSON_PROPERTY_STATS,
IntegrationInfo.JSON_PROPERTY_EDGE_TEMPLATE,
IntegrationInfo.JSON_PROPERTY_REMOTE
IntegrationInfo.JSON_PROPERTY_REMOTE,
IntegrationInfo.JSON_PROPERTY_EDGE_TEMPLATE
})
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0")
public class IntegrationInfo {
Expand Down Expand Up @@ -107,14 +107,14 @@ public class IntegrationInfo {
public static final String JSON_PROPERTY_STATS = "stats";
private JsonNullable<Object> stats = JsonNullable.<Object>of(null);

public static final String JSON_PROPERTY_EDGE_TEMPLATE = "edgeTemplate";
@javax.annotation.Nullable
private Boolean edgeTemplate;

public static final String JSON_PROPERTY_REMOTE = "remote";
@javax.annotation.Nullable
private Boolean remote;

public static final String JSON_PROPERTY_EDGE_TEMPLATE = "edgeTemplate";
@javax.annotation.Nullable
private Boolean edgeTemplate;

public IntegrationInfo() {
}

Expand Down Expand Up @@ -406,51 +406,51 @@ public void setStats(@javax.annotation.Nullable Object stats) {
}


public IntegrationInfo edgeTemplate(@javax.annotation.Nullable Boolean edgeTemplate) {
this.edgeTemplate = edgeTemplate;
public IntegrationInfo remote(@javax.annotation.Nullable Boolean remote) {
this.remote = remote;
return this;
}

/**
* Boolean flag that specifies that is regular or edge template integration
* @return edgeTemplate
* Boolean flag to enable/disable the integration to be executed remotely. Remote integration is launched in a separate microservice. Local integration is executed by the platform core
* @return remote
*/
@javax.annotation.Nullable
@JsonProperty(value = JSON_PROPERTY_EDGE_TEMPLATE, required = false)
@JsonProperty(value = JSON_PROPERTY_REMOTE, required = false)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Boolean getEdgeTemplate() {
return edgeTemplate;
public Boolean getRemote() {
return remote;
}


@JsonProperty(value = JSON_PROPERTY_EDGE_TEMPLATE, required = false)
@JsonProperty(value = JSON_PROPERTY_REMOTE, required = false)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public void setEdgeTemplate(@javax.annotation.Nullable Boolean edgeTemplate) {
this.edgeTemplate = edgeTemplate;
public void setRemote(@javax.annotation.Nullable Boolean remote) {
this.remote = remote;
}


public IntegrationInfo remote(@javax.annotation.Nullable Boolean remote) {
this.remote = remote;
public IntegrationInfo edgeTemplate(@javax.annotation.Nullable Boolean edgeTemplate) {
this.edgeTemplate = edgeTemplate;
return this;
}

/**
* Boolean flag to enable/disable the integration to be executed remotely. Remote integration is launched in a separate microservice. Local integration is executed by the platform core
* @return remote
* Boolean flag that specifies that is regular or edge template integration
* @return edgeTemplate
*/
@javax.annotation.Nullable
@JsonProperty(value = JSON_PROPERTY_REMOTE, required = false)
@JsonProperty(value = JSON_PROPERTY_EDGE_TEMPLATE, required = false)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public Boolean getRemote() {
return remote;
public Boolean getEdgeTemplate() {
return edgeTemplate;
}


@JsonProperty(value = JSON_PROPERTY_REMOTE, required = false)
@JsonProperty(value = JSON_PROPERTY_EDGE_TEMPLATE, required = false)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public void setRemote(@javax.annotation.Nullable Boolean remote) {
this.remote = remote;
public void setEdgeTemplate(@javax.annotation.Nullable Boolean edgeTemplate) {
this.edgeTemplate = edgeTemplate;
}


Expand Down Expand Up @@ -478,8 +478,8 @@ public boolean equals(Object o) {
Objects.equals(this.version, integrationInfo.version) &&
Objects.equals(this.status, integrationInfo.status) &&
equalsNullable(this.stats, integrationInfo.stats) &&
Objects.equals(this.edgeTemplate, integrationInfo.edgeTemplate) &&
Objects.equals(this.remote, integrationInfo.remote);
Objects.equals(this.remote, integrationInfo.remote) &&
Objects.equals(this.edgeTemplate, integrationInfo.edgeTemplate);
}

private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b) {
Expand All @@ -488,7 +488,7 @@ private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b)

@Override
public int hashCode() {
return Objects.hash(id, createdTime, tenantId, name, type, debugMode, debugSettings, enabled, allowCreateDevicesOrAssets, version, status, hashCodeNullable(stats), edgeTemplate, remote);
return Objects.hash(id, createdTime, tenantId, name, type, debugMode, debugSettings, enabled, allowCreateDevicesOrAssets, version, status, hashCodeNullable(stats), remote, edgeTemplate);
}

private static <T> int hashCodeNullable(JsonNullable<T> a) {
Expand All @@ -514,8 +514,8 @@ public String toString() {
sb.append(" version: ").append(toIndentedString(version)).append("\n");
sb.append(" status: ").append(toIndentedString(status)).append("\n");
sb.append(" stats: ").append(toIndentedString(stats)).append("\n");
sb.append(" edgeTemplate: ").append(toIndentedString(edgeTemplate)).append("\n");
sb.append(" remote: ").append(toIndentedString(remote)).append("\n");
sb.append(" edgeTemplate: ").append(toIndentedString(edgeTemplate)).append("\n");
sb.append("}");
return sb.toString();
}
Expand Down Expand Up @@ -623,16 +623,16 @@ public String toUrlQueryString(String prefix) {
joiner.add(String.format(java.util.Locale.ROOT, "%sstats%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getStats()))));
}

// add `edgeTemplate` to the URL query string
if (getEdgeTemplate() != null) {
joiner.add(String.format(java.util.Locale.ROOT, "%sedgeTemplate%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEdgeTemplate()))));
}

// add `remote` to the URL query string
if (getRemote() != null) {
joiner.add(String.format(java.util.Locale.ROOT, "%sremote%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getRemote()))));
}

// add `edgeTemplate` to the URL query string
if (getEdgeTemplate() != null) {
joiner.add(String.format(java.util.Locale.ROOT, "%sedgeTemplate%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getEdgeTemplate()))));
}

return joiner.toString();
}
}
Expand Down
Loading
Loading