From 66d4c3fd20bf7843030820a44c06635156a109bc Mon Sep 17 00:00:00 2001
From: AndrewVolosytnykhThingsboard
 <77969531+AndrewVolosytnykhThingsboard@users.noreply.github.com>
Date: Wed, 23 Jun 2021 14:54:27 +0300
Subject: [PATCH] Clean exception message without class name and path (#4758)

* Clean exception message without class name and path

* Correct message, improvents to text of poppup on deleting

* Added log for except files

* Correct license header
---
 .../service/resource/DefaultTbResourceService.java    | 11 ++++++-----
 ui-ngx/src/assets/locale/locale.constant-en_US.json   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java b/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java
index cd8aa88863..689b7fd9a9 100644
--- a/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java
+++ b/application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java
@@ -86,7 +86,10 @@ public class DefaultTbResourceService implements TbResourceService {
                 } else {
                     throw new DataValidationException(String.format("Could not parse the XML of objectModel with name %s", resource.getSearchText()));
                 }
-            } catch (InvalidDDFFileException | IOException e) {
+            } catch (InvalidDDFFileException e) {
+                log.error("Failed to parse file {}", resource.getFileName(), e);
+                throw new DataValidationException("Failed to parse file " + resource.getFileName());
+            } catch (IOException e) {
                 throw new ThingsboardException(e, ThingsboardErrorCode.GENERAL);
             }
             if (resource.getResourceType().equals(ResourceType.LWM2M_MODEL) && toLwM2mObject(resource, true) == null) {
@@ -194,8 +197,7 @@ public class DefaultTbResourceService implements TbResourceService {
                     if (isSave) {
                         LwM2mResourceObserve lwM2MResourceObserve = new LwM2mResourceObserve(k, v.name, false, false, false);
                         resources.add(lwM2MResourceObserve);
-                    }
-                    else if (v.operations.isReadable()) {
+                    } else if (v.operations.isReadable()) {
                         LwM2mResourceObserve lwM2MResourceObserve = new LwM2mResourceObserve(k, v.name, false, false, false);
                         resources.add(lwM2MResourceObserve);
                     }
@@ -204,8 +206,7 @@ public class DefaultTbResourceService implements TbResourceService {
                     instance.setResources(resources.toArray(LwM2mResourceObserve[]::new));
                     lwM2mObject.setInstances(new LwM2mInstance[]{instance});
                     return lwM2mObject;
-                }
-                else {
+                } else {
                     return null;
                 }
             }
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 4af8c7a87a..6736c168b2 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2362,7 +2362,7 @@
         "delete-resource-text": "Be careful, after the confirmation the resource will become unrecoverable.",
         "delete-resource-title": "Are you sure you want to delete the resource '{{resourceTitle}}'?",
         "delete-resources-action-title": "Delete { count, plural, 1 {1 resource} other {# resources} }",
-        "delete-resources-text": "Be careful, after the confirmation all selected resources will be removed.",
+        "delete-resources-text": "Please note that the selected resources, even if they are used in device profiles, will be deleted.",
         "delete-resources-title": "Are you sure you want to delete { count, plural, 1 {1 resource} other {# resources} }?",
         "download": "Download resource",
         "drop-file": "Drop a resource file or click to select a file to upload.",