Merge pull request #12626 from thingsboard/remove-deprecation

Remove outdated deprecation checks

application/src/main/java/org/thingsboard/server/service/update/DeprecationService.java

@@ -1,90 +0,0 @@
-/**
- * Copyright © 2016-2024 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.update;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.thingsboard.rule.engine.api.NotificationCenter;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.notification.info.GeneralNotificationInfo;
-import org.thingsboard.server.common.data.notification.targets.platform.SystemAdministratorsFilter;
-import org.thingsboard.server.dao.notification.DefaultNotifications;
-import org.thingsboard.server.dao.notification.DefaultNotifications.DefaultNotification;
-import org.thingsboard.server.queue.util.AfterStartUp;
-
-import java.util.Map;
-
-@Service
-@Slf4j
-@RequiredArgsConstructor
-public class DeprecationService {
-
-    private final NotificationCenter notificationCenter;
-
-    @Value("${queue.type}")
-    private String queueType;
-
-    @Value("${database.ts.type}")
-    private String tsType;
-
-    @Value("${database.ts_latest.type}")
-    private String tsLatestType;
-
-    @AfterStartUp(order = Integer.MAX_VALUE)
-    public void checkDeprecation() {
-        checkQueueTypeDeprecation();
-        checkDatabaseTypeDeprecation();
-    }
-
-    private void checkQueueTypeDeprecation() {
-        String queueTypeName;
-        switch (queueType) {
-            case "aws-sqs" -> queueTypeName = "AWS SQS";
-            case "pubsub" -> queueTypeName = "PubSub";
-            case "service-bus" -> queueTypeName = "Azure Service Bus";
-            case "rabbitmq" -> queueTypeName = "RabbitMQ";
-            default -> {
-                return;
-            }
-        }
-
-        log.warn("WARNING: Starting with ThingsBoard 4.0, {} will no longer be supported as a message queue for microservices. " +
-                "Please migrate to Apache Kafka. This change will not impact any rule nodes", queueTypeName);
-        sendNotification(DefaultNotifications.queueTypeDeprecation, Map.of(
-                "queueType", queueTypeName
-        ));
-    }
-
-    private void checkDatabaseTypeDeprecation() {
-        String deprecatedDatabaseType = "Timescale";
-        if (StringUtils.equalsAnyIgnoreCase(deprecatedDatabaseType, tsType, tsLatestType)) {
-            log.warn("WARNING: Starting with ThingsBoard 4.0, {} will no longer be supported as a storage provider. " +
-                    "Please migrate to Cassandra or PostgreSQL.", deprecatedDatabaseType);
-            sendNotification(DefaultNotifications.databaseTypeDeprecation, Map.of(
-                    "databaseType", deprecatedDatabaseType
-            ));
-        }
-    }
-
-    private void sendNotification(DefaultNotification notification, Map<String, String> info) {
-        notificationCenter.sendGeneralWebNotification(TenantId.SYS_TENANT_ID, new SystemAdministratorsFilter(),
-                notification.toTemplate(), new GeneralNotificationInfo(info));
-    }
-
-}

dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java

@@ -372,25 +372,6 @@ public class DefaultNotifications {
                     .build())
             .build();
 
-    public static final DefaultNotification queueTypeDeprecation = DefaultNotification.builder()
-            .name("Queue type deprecation")
-            .type(NotificationType.GENERAL)
-            .subject("WARNING: ${queueType} deprecation")
-            .text("Starting with ThingsBoard 4.0, ${queueType} will no longer be supported as a message queue for microservices. " +
-                    "Please migrate to Apache Kafka. This change will not impact any rule nodes.")
-            .icon("warning").color(RED_COLOR)
-            .build();
-
-    public static final DefaultNotification databaseTypeDeprecation = DefaultNotification.builder()
-            .name("Database type deprecation")
-            .type(NotificationType.GENERAL)
-            .subject("WARNING: ${databaseType} deprecation")
-            .text("Starting with ThingsBoard 4.0, ${databaseType} will no longer be supported as a storage provider. " +
-                    "Please migrate to Cassandra or PostgreSQL.")
-            .icon("warning")
-            .color(RED_COLOR)
-            .build();
-
     private final NotificationTemplateService templateService;
     private final NotificationRuleService ruleService;
 

rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/NotificationCenter.java

@@ -36,7 +36,7 @@ public interface NotificationCenter {
 
     NotificationRequest processNotificationRequest(TenantId tenantId, NotificationRequest notificationRequest, FutureCallback<NotificationRequestStats> callback);
 
-    void sendGeneralWebNotification(TenantId tenantId, UsersFilter recipients, NotificationTemplate template, GeneralNotificationInfo info);
+    void sendGeneralWebNotification(TenantId tenantId, UsersFilter recipients, NotificationTemplate template, GeneralNotificationInfo info); // for future use
 
     void sendSystemNotification(TenantId tenantId, NotificationTargetId targetId, NotificationType type, NotificationInfo info); // for future use and compatibility with PE