Removed TODO from code - add story into backlog

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java

@@ -43,11 +43,6 @@ public class DeviceProfileMsgConstructor {
                 .setDefault(deviceProfile.isDefault())
                 .setType(deviceProfile.getType().name())
                 .setProfileDataBytes(ByteString.copyFrom(dataDecodingEncodingService.encode(deviceProfile.getProfileData())));
-        // TODO: @voba - add possibility to setup edge rule chain as device profile default
-//        if (deviceProfile.getDefaultRuleChainId() != null) {
-//            builder.setDefaultRuleChainIdMSB(deviceProfile.getDefaultRuleChainId().getId().getMostSignificantBits())
-//                    .setDefaultRuleChainIdLSB(deviceProfile.getDefaultRuleChainId().getId().getLeastSignificantBits());
-//        }
         if (deviceProfile.getDefaultQueueName() != null) {
             builder.setDefaultQueueName(deviceProfile.getDefaultQueueName());
         }

application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AdminSettingsEdgeEventFetcher.java

@@ -54,10 +54,10 @@ public class AdminSettingsEdgeEventFetcher implements EdgeEventFetcher {
     private final AdminSettingsService adminSettingsService;
     private final Configuration freemarkerConfig;
 
-    private static Pattern startPattern = Pattern.compile("<div class=\"content\".*?>");
-    private static Pattern endPattern = Pattern.compile("<div class=\"footer\".*?>");
+    private static final Pattern startPattern = Pattern.compile("<div class=\"content\".*?>");
+    private static final Pattern endPattern = Pattern.compile("<div class=\"footer\".*?>");
 
-    private static List<String> templatesNames = Arrays.asList(
+    private static final List<String> templatesNames = Arrays.asList(
             "account.activated.ftl",
             "account.lockout.ftl",
             "activation.ftl",
@@ -65,7 +65,7 @@ public class AdminSettingsEdgeEventFetcher implements EdgeEventFetcher {
             "reset.password.ftl",
             "test.ftl");
 
-    // TODO: fix format of next templates
+    // TODO: @voba fix format of next templates
     // "state.disabled.ftl",
     // "state.enabled.ftl",
     // "state.warning.ftl",
@@ -95,7 +95,7 @@ public class AdminSettingsEdgeEventFetcher implements EdgeEventFetcher {
         result.add(EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.ADMIN_SETTINGS,
                 EdgeEventActionType.UPDATED, null, mapper.valueToTree(tenantMailTemplates)));
 
-        // @voba - returns PageData object to be in sync with other fetchers
+        // return PageData object to be in sync with other fetchers
         return new PageData<>(result, 1, result.size(), false);
     }