Refactoring code
This commit is contained in:
		
							parent
							
								
									ff3f0234a9
								
							
						
					
					
						commit
						a50fa91728
					
				@ -49,7 +49,11 @@ import org.thingsboard.server.common.data.page.PageLink;
 | 
			
		||||
import org.thingsboard.server.common.data.page.TimePageLink;
 | 
			
		||||
import org.thingsboard.server.common.data.query.DynamicValue;
 | 
			
		||||
import org.thingsboard.server.common.data.query.FilterPredicateValue;
 | 
			
		||||
import org.thingsboard.server.common.data.queue.*;
 | 
			
		||||
import org.thingsboard.server.common.data.queue.ProcessingStrategy;
 | 
			
		||||
import org.thingsboard.server.common.data.queue.ProcessingStrategyType;
 | 
			
		||||
import org.thingsboard.server.common.data.queue.Queue;
 | 
			
		||||
import org.thingsboard.server.common.data.queue.SubmitStrategy;
 | 
			
		||||
import org.thingsboard.server.common.data.queue.SubmitStrategyType;
 | 
			
		||||
import org.thingsboard.server.common.data.relation.EntityRelation;
 | 
			
		||||
import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 | 
			
		||||
import org.thingsboard.server.common.data.rule.RuleChain;
 | 
			
		||||
@ -181,17 +185,15 @@ public class DefaultDataUpdateService implements DataUpdateService {
 | 
			
		||||
                }
 | 
			
		||||
                break;
 | 
			
		||||
            case "3.4.1":
 | 
			
		||||
                log.info("Updating data from version 3.4.1 to 3.4.2 ...");
 | 
			
		||||
                boolean skipAuditLogsMigration = getEnv("TB_SKIP_AUDIT_LOGS_MIGRATION", false);
 | 
			
		||||
                boolean skipEdgeEventsMigration = getEnv("TB_SKIP_EDGE_EVENTS_MIGRATION", false);
 | 
			
		||||
                if (!skipAuditLogsMigration || !skipEdgeEventsMigration) {
 | 
			
		||||
                    log.info("Updating data from version 3.4.1 to 3.4.2 ...");
 | 
			
		||||
                }
 | 
			
		||||
                if (!skipAuditLogsMigration) {
 | 
			
		||||
                    log.info("Starting audit logs migration. Can be skipped with TB_SKIP_AUDIT_LOGS_MIGRATION env variable set to true");
 | 
			
		||||
                    auditLogDao.migrateAuditLogs();
 | 
			
		||||
                } else {
 | 
			
		||||
                    log.info("Skipping audit logs migration");
 | 
			
		||||
                }
 | 
			
		||||
                boolean skipEdgeEventsMigration = getEnv("TB_SKIP_EDGE_EVENTS_MIGRATION", false);
 | 
			
		||||
                if (!skipEdgeEventsMigration) {
 | 
			
		||||
                    log.info("Starting edge events migration. Can be skipped with TB_SKIP_EDGE_EVENTS_MIGRATION env variable set to true");
 | 
			
		||||
                    edgeEventDao.migrateEdgeEvents();
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user