Merge pull request #30 from thingsboard/auto/update-pe-client

Update PE OpenAPI spec (from master)

Author: ViacheslavKlimov

pe/docs/SolutionImportResult.md

@@ -11,6 +11,7 @@ Result of a solution import operation.
 |------------ | ------------- | ------------- | -------------|
 | **success** | **Boolean** | 'true' if all entities were imported successfully. | [optional] |
 | **created** | **Map\<String, Integer\>** | Number of newly created entities per entity type. Entity types with zero created entities are omitted. | [optional] |
+| **idMapping** | **Map\<String, UUID\>** | Mapping from external entity IDs (as they appear in the solution file) to the internal entity IDs assigned during import. | [optional] |
 
 
 

pe/spec/openapi.json

@@ -137256,6 +137256,14 @@
               "DEVICE_PROFILE": 1,
               "DEVICE": 3
             }
+          },
+          "idMapping": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string",
+              "format": "uuid"
+            },
+            "description": "Mapping from external entity IDs (as they appear in the solution file) to the internal entity IDs assigned during import."
           }
         }
       },

pe/src/main/java/org/thingsboard/client/model/SolutionImportResult.java

@@ -31,6 +31,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 
@@ -40,7 +41,8 @@
  */
 @JsonPropertyOrder({
   SolutionImportResult.JSON_PROPERTY_SUCCESS,
-  SolutionImportResult.JSON_PROPERTY_CREATED
+  SolutionImportResult.JSON_PROPERTY_CREATED,
+  SolutionImportResult.JSON_PROPERTY_ID_MAPPING
 })
 @Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.20.0")
 public class SolutionImportResult {
@@ -52,6 +54,10 @@ public class SolutionImportResult {
   @Nullable
   private Map<String, Integer> created = new HashMap<>();
 
+  public static final String JSON_PROPERTY_ID_MAPPING = "idMapping";
+  @Nullable
+  private Map<String, UUID> idMapping = new HashMap<>();
+
   public SolutionImportResult() { 
   }
 
@@ -111,6 +117,38 @@ public void setCreated(@Nullable Map<String, Integer> created) {
   }
 
 
+  public SolutionImportResult idMapping(@Nullable Map<String, UUID> idMapping) {
+    this.idMapping = idMapping;
+    return this;
+  }
+
+  public SolutionImportResult putIdMappingItem(String key, UUID idMappingItem) {
+    if (this.idMapping == null) {
+      this.idMapping = new HashMap<>();
+    }
+    this.idMapping.put(key, idMappingItem);
+    return this;
+  }
+
+  /**
+   * Mapping from external entity IDs (as they appear in the solution file) to the internal entity IDs assigned during import.
+   * @return idMapping
+   */
+  @Nullable
+  @JsonProperty(value = JSON_PROPERTY_ID_MAPPING, required = false)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Map<String, UUID> getIdMapping() {
+    return idMapping;
+  }
+
+
+  @JsonProperty(value = JSON_PROPERTY_ID_MAPPING, required = false)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public void setIdMapping(@Nullable Map<String, UUID> idMapping) {
+    this.idMapping = idMapping;
+  }
+
+
   /**
    * Return true if this SolutionImportResult object is equal to o.
    */
@@ -124,12 +162,13 @@ public boolean equals(Object o) {
     }
     SolutionImportResult solutionImportResult = (SolutionImportResult) o;
     return Objects.equals(this.success, solutionImportResult.success) &&
-        Objects.equals(this.created, solutionImportResult.created);
+        Objects.equals(this.created, solutionImportResult.created) &&
+        Objects.equals(this.idMapping, solutionImportResult.idMapping);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(success, created);
+    return Objects.hash(success, created, idMapping);
   }
 
   @Override
@@ -138,6 +177,7 @@ public String toString() {
     sb.append("class SolutionImportResult {\n");
     sb.append("    success: ").append(toIndentedString(success)).append("\n");
     sb.append("    created: ").append(toIndentedString(created)).append("\n");
+    sb.append("    idMapping: ").append(toIndentedString(idMapping)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -199,6 +239,15 @@ public String toUrlQueryString(String prefix) {
       }
     }
 
+    // add `idMapping` to the URL query string
+    if (getIdMapping() != null) {
+      for (String _key : getIdMapping().keySet()) {
+        joiner.add(String.format(java.util.Locale.ROOT, "%sidMapping%s%s=%s", prefix, suffix,
+            "".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, _key, containerSuffix),
+            getIdMapping().get(_key), ApiClient.urlEncode(ApiClient.valueToString(getIdMapping().get(_key)))));
+      }
+    }
+
     return joiner.toString();
   }
 }