WidgetTypes fetch feature

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.controller;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -25,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
@@ -37,6 +39,7 @@ import org.thingsboard.server.service.security.permission.Resource;
 
 import java.util.List;
 
+@Slf4j
 @RestController
 @TbCoreComponent
 @RequestMapping("/api")
@@ -67,8 +70,11 @@ public class WidgetTypeController extends BaseController {
             }
 
             checkEntity(widgetType.getId(), widgetType, Resource.WIDGET_TYPE);
+            WidgetType savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
 
-            return checkNotNull(widgetTypeService.saveWidgetType(widgetType));
+            sendNotificationMsgToEdgeService(savedWidgetType.getTenantId(), savedWidgetType.getId(), ActionType.UPDATED);
+
+            return checkNotNull(savedWidgetType);
         } catch (Exception e) {
             throw handleException(e);
         }
@@ -83,6 +89,9 @@ public class WidgetTypeController extends BaseController {
             WidgetTypeId widgetTypeId = new WidgetTypeId(toUUID(strWidgetTypeId));
             checkWidgetTypeId(widgetTypeId, Operation.DELETE);
             widgetTypeService.deleteWidgetType(getCurrentUser().getTenantId(), widgetTypeId);
+
+            sendNotificationMsgToEdgeService(getTenantId(), widgetTypeId, ActionType.DELETED);
+
         } catch (Exception e) {
             throw handleException(e);
         }

@@ -158,6 +158,7 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
                 case DASHBOARD:
                 case RULE_CHAIN:
                 case WIDGETS_BUNDLE:
+                case WIDGET_TYPE:
                     processEntity(tenantId, edgeNotificationMsg);
                     break;
                 case ALARM:
@@ -186,7 +187,7 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
             // case ADDED:
             case UPDATED:
             case CREDENTIALS_UPDATED:
-                if (edgeEventType.equals(EdgeEventType.WIDGETS_BUNDLE)) {
+                if (edgeEventType.equals(EdgeEventType.WIDGETS_BUNDLE) || edgeEventType.equals(EdgeEventType.WIDGET_TYPE)) {
                     TextPageData<Edge> edgesByTenantId = edgeService.findEdgesByTenantId(tenantId, new TextPageLink(Integer.MAX_VALUE));
                     if (edgesByTenantId != null && edgesByTenantId.getData() != null && !edgesByTenantId.getData().isEmpty()) {
                         for (Edge edge : edgesByTenantId.getData()) {

@@ -33,6 +33,7 @@ import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.dao.widget.WidgetTypeService;
 import org.thingsboard.server.dao.widget.WidgetsBundleService;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
@@ -118,6 +119,10 @@ public class EdgeContextComponent {
 
     @Lazy
     @Autowired
+    private WidgetTypeService widgetTypeService;
+
+    @Lazy
+    @Autowired
     private DeviceStateService deviceStateService;
 
     @Lazy
@@ -166,6 +171,10 @@ public class EdgeContextComponent {
 
     @Lazy
     @Autowired
+    private WidgetTypeUpdateMsgConstructor widgetTypeUpdateMsgConstructor;
+
+    @Lazy
+    @Autowired
     private EntityDataMsgConstructor entityDataMsgConstructor;
 
     @Lazy

@@ -43,18 +43,7 @@ import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
-import org.thingsboard.server.common.data.id.AlarmId;
-import org.thingsboard.server.common.data.id.AssetId;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.DashboardId;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.EdgeId;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.EntityViewId;
-import org.thingsboard.server.common.data.id.RuleChainId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.id.UserId;
-import org.thingsboard.server.common.data.id.WidgetsBundleId;
+import org.thingsboard.server.common.data.id.*;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
@@ -67,6 +56,7 @@ import org.thingsboard.server.common.data.rule.RuleChainMetaData;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.DeviceCredentialsType;
 import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.common.data.widget.WidgetType;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
@@ -74,34 +64,7 @@ import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
 import org.thingsboard.server.common.msg.session.SessionMsgType;
 import org.thingsboard.server.common.transport.util.JsonUtils;
-import org.thingsboard.server.gen.edge.AlarmUpdateMsg;
-import org.thingsboard.server.gen.edge.AssetUpdateMsg;
-import org.thingsboard.server.gen.edge.AttributesRequestMsg;
-import org.thingsboard.server.gen.edge.ConnectRequestMsg;
-import org.thingsboard.server.gen.edge.ConnectResponseCode;
-import org.thingsboard.server.gen.edge.ConnectResponseMsg;
-import org.thingsboard.server.gen.edge.DashboardUpdateMsg;
-import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg;
-import org.thingsboard.server.gen.edge.DeviceCredentialsUpdateMsg;
-import org.thingsboard.server.gen.edge.DeviceUpdateMsg;
-import org.thingsboard.server.gen.edge.DownlinkMsg;
-import org.thingsboard.server.gen.edge.EdgeConfiguration;
-import org.thingsboard.server.gen.edge.EntityDataProto;
-import org.thingsboard.server.gen.edge.EntityUpdateMsg;
-import org.thingsboard.server.gen.edge.EntityViewUpdateMsg;
-import org.thingsboard.server.gen.edge.RelationRequestMsg;
-import org.thingsboard.server.gen.edge.RequestMsg;
-import org.thingsboard.server.gen.edge.RequestMsgType;
-import org.thingsboard.server.gen.edge.ResponseMsg;
-import org.thingsboard.server.gen.edge.RuleChainMetadataRequestMsg;
-import org.thingsboard.server.gen.edge.RuleChainMetadataUpdateMsg;
-import org.thingsboard.server.gen.edge.RuleChainUpdateMsg;
-import org.thingsboard.server.gen.edge.UpdateMsgType;
-import org.thingsboard.server.gen.edge.UplinkMsg;
-import org.thingsboard.server.gen.edge.UplinkResponseMsg;
-import org.thingsboard.server.gen.edge.UserCredentialsRequestMsg;
-import org.thingsboard.server.gen.edge.UserCredentialsUpdateMsg;
-import org.thingsboard.server.gen.edge.WidgetsBundleUpdateMsg;
+import org.thingsboard.server.gen.edge.*;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.TbQueueCallback;
 import org.thingsboard.server.queue.TbQueueMsgMetadata;
@@ -341,6 +304,9 @@ public final class EdgeGrpcSession implements Closeable {
             case WIDGETS_BUNDLE:
                 processWidgetsBundle(edgeEvent, msgType, edgeEventAction);
                 break;
+            case WIDGET_TYPE:
+                processWidgetType(edgeEvent, msgType, edgeEventAction);
+                break;
         }
     }
 
@@ -624,6 +590,36 @@ public final class EdgeGrpcSession implements Closeable {
         }
     }
 
+    private void processWidgetType(EdgeEvent edgeEvent, UpdateMsgType msgType, ActionType edgeActionType) {
+        WidgetTypeId widgetTypeId = new WidgetTypeId(edgeEvent.getEntityId());
+        EntityUpdateMsg entityUpdateMsg = null;
+        switch (edgeActionType) {
+            case ADDED:
+            case UPDATED:
+                WidgetType widgetType = ctx.getWidgetTypeService().findWidgetTypeById(edgeEvent.getTenantId(), widgetTypeId);
+                if (widgetType != null) {
+                    WidgetTypeUpdateMsg widgetTypeUpdateMsg =
+                            ctx.getWidgetTypeUpdateMsgConstructor().constructWidgetTypeUpdateMsg(msgType, widgetType);
+                    entityUpdateMsg = EntityUpdateMsg.newBuilder()
+                            .setWidgetTypeUpdateMsg(widgetTypeUpdateMsg)
+                            .build();
+                }
+                break;
+            case DELETED:
+                WidgetTypeUpdateMsg widgetTypeUpdateMsg =
+                        ctx.getWidgetTypeUpdateMsgConstructor().constructWidgetTypeUpdateMsg(widgetTypeId);
+               entityUpdateMsg = EntityUpdateMsg.newBuilder()
+                       .setWidgetTypeUpdateMsg(widgetTypeUpdateMsg)
+                       .build();
+                break;
+        }
+        if (entityUpdateMsg != null) {
+            outputStream.onNext(ResponseMsg.newBuilder()
+                    .setEntityUpdateMsg(entityUpdateMsg)
+                    .build());
+        }
+    }
+
     private UpdateMsgType getResponseMsgType(ActionType actionType) {
         switch (actionType) {
             case UPDATED:

+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.edge.rpc.constructor;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.id.WidgetTypeId;
+import org.thingsboard.server.common.data.widget.WidgetType;
+import org.thingsboard.server.dao.util.mapping.JacksonUtil;
+import org.thingsboard.server.gen.edge.UpdateMsgType;
+import org.thingsboard.server.gen.edge.WidgetTypeUpdateMsg;
+
+@Component
+@Slf4j
+public class WidgetTypeUpdateMsgConstructor {
+
+    public WidgetTypeUpdateMsg constructWidgetTypeUpdateMsg(UpdateMsgType msgType, WidgetType widgetType) {
+        WidgetTypeUpdateMsg.Builder builder = WidgetTypeUpdateMsg.newBuilder()
+                .setMsgType(msgType)
+                .setIdMSB(widgetType.getId().getId().getMostSignificantBits())
+                .setIdLSB(widgetType.getId().getId().getLeastSignificantBits());
+                if (widgetType.getBundleAlias() != null) {
+                    builder.setBundleAlias(widgetType.getBundleAlias());
+                }
+                if (widgetType.getAlias() != null) {
+                    builder.setAlias(widgetType.getAlias());
+                }
+                if (widgetType.getName() != null) {
+                    builder.setName(widgetType.getName());
+                }
+                if (widgetType.getDescriptor() != null) {
+                    builder.setDescriptorJson(JacksonUtil.toString(widgetType.getDescriptor()));
+                }
+                return builder.build();
+    }
+
+    public WidgetTypeUpdateMsg constructWidgetTypeUpdateMsg(WidgetTypeId widgetTypeId) {
+        return WidgetTypeUpdateMsg.newBuilder()
+                .setMsgType(UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE)
+                .setIdMSB(widgetTypeId.getId().getMostSignificantBits())
+                .setIdLSB(widgetTypeId.getId().getLeastSignificantBits())
+                .build();
+    }
+}

@@ -38,6 +38,8 @@ public final class EdgeUtils {
                 return EdgeEventType.ALARM;
             case WIDGETS_BUNDLE:
                 return EdgeEventType.WIDGETS_BUNDLE;
+            case WIDGET_TYPE:
+                return EdgeEventType.WIDGET_TYPE;
             default:
                 return null;
         }

@@ -27,5 +27,6 @@ public enum EdgeEventType {
     USER,
     CUSTOMER,
     RELATION,
-    WIDGETS_BUNDLE
+    WIDGETS_BUNDLE,
+    WIDGET_TYPE
 }

@@ -89,6 +89,8 @@ public class EntityIdFactory {
                 return new EntityViewId(uuid);
             case WIDGETS_BUNDLE:
                 return new WidgetsBundleId(uuid);
+            case WIDGET_TYPE:
+                return new WidgetTypeId(uuid);
             case EDGE:
                 return new EdgeId(uuid);
         }

@@ -60,6 +60,7 @@ message EntityUpdateMsg {
   CustomerUpdateMsg customerUpdateMsg = 11;
   RelationUpdateMsg relationUpdateMsg = 12;
   WidgetsBundleUpdateMsg widgetsBundleUpdateMsg = 13;
+  WidgetTypeUpdateMsg widgetTypeUpdateMsg = 14;
 }
 
 enum RequestMsgType {
@@ -276,6 +277,16 @@ message WidgetsBundleUpdateMsg {
   bytes image = 6;
 }
 
+message WidgetTypeUpdateMsg {
+  UpdateMsgType msgType = 1;
+  int64 idMSB = 2;
+  int64 idLSB = 3;
+  string bundleAlias = 4;
+  string alias = 5;
+  string name = 6;
+  string descriptorJson = 7;
+}
+
 message UserCredentialsUpdateMsg {
   int64 userIdMSB = 1;
   int64 userIdLSB = 2;