Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into feature/6371

application/src/main/resources/thingsboard.yml

@@ -476,6 +476,8 @@ updates:
   # Enable/disable updates checking.
   enabled: "${UPDATES_ENABLED:true}"
 
+spring.main.allow-circular-references: "true"
+
 # spring freemarker configuration
 spring.freemarker.checkTemplateLocation: "false"
 

application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java

@@ -151,7 +151,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
     public void testSetDefaultDeviceProfile() throws Exception {
         DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile 1", null);
         DeviceProfile savedDeviceProfile = doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
-        DeviceProfile defaultDeviceProfile = doPost("/api/deviceProfile/"+savedDeviceProfile.getId().getId().toString()+"/default", null, DeviceProfile.class);
+        DeviceProfile defaultDeviceProfile = doPost("/api/deviceProfile/"+savedDeviceProfile.getId().getId().toString()+"/default", DeviceProfile.class);
         Assert.assertNotNull(defaultDeviceProfile);
         DeviceProfileInfo foundDefaultDeviceProfile = doGet("/api/deviceProfileInfo/default", DeviceProfileInfo.class);
         Assert.assertNotNull(foundDefaultDeviceProfile);

application/src/test/java/org/thingsboard/server/controller/BaseTenantProfileControllerTest.java

@@ -109,7 +109,7 @@ public abstract class BaseTenantProfileControllerTest extends AbstractController
         loginSysAdmin();
         TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile 1");
         TenantProfile savedTenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
-        TenantProfile defaultTenantProfile = doPost("/api/tenantProfile/"+savedTenantProfile.getId().getId().toString()+"/default", null, TenantProfile.class);
+        TenantProfile defaultTenantProfile = doPost("/api/tenantProfile/"+savedTenantProfile.getId().getId().toString()+"/default", TenantProfile.class);
         Assert.assertNotNull(defaultTenantProfile);
         EntityInfo foundDefaultTenantProfile = doGet("/api/tenantProfileInfo/default", EntityInfo.class);
         Assert.assertNotNull(foundDefaultTenantProfile);

common/cache/src/main/java/org/thingsboard/server/cache/TBRedisCacheConfiguration.java

@@ -33,6 +33,8 @@ import org.springframework.util.Assert;
 import org.thingsboard.server.common.data.id.EntityId;
 import redis.clients.jedis.JedisPoolConfig;
 
+import java.time.Duration;
+
 @Configuration
 @ConditionalOnProperty(prefix = "cache", value = "type", havingValue = "redis", matchIfMissing = false)
 @EnableCaching
@@ -114,8 +116,8 @@ public abstract class TBRedisCacheConfiguration {
         poolConfig.setTestOnBorrow(testOnBorrow);
         poolConfig.setTestOnReturn(testOnReturn);
         poolConfig.setTestWhileIdle(testWhileIdle);
-        poolConfig.setMinEvictableIdleTimeMillis(minEvictableMs);
-        poolConfig.setTimeBetweenEvictionRunsMillis(evictionRunsMs);
+        poolConfig.setSoftMinEvictableIdleTime(Duration.ofMillis(minEvictableMs));
+        poolConfig.setTimeBetweenEvictionRuns(Duration.ofMillis(evictionRunsMs));
         poolConfig.setMaxWaitMillis(maxWaitMills);
         poolConfig.setNumTestsPerEvictionRun(numberTestsPerEvictionRun);
         poolConfig.setBlockWhenExhausted(blockWhenExhausted);

common/dao-api/src/main/java/org/thingsboard/server/dao/util/TbAutoConfiguration.java

@@ -0,0 +1,29 @@
+/**
+ * Copyright © 2016-2022 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.dao.util;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+@EnableAutoConfiguration(exclude = {CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class, RedisAutoConfiguration.class})
+public @interface TbAutoConfiguration {
+}

dao/pom.xml

@@ -220,14 +220,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>rest</artifactId>

dao/src/main/java/org/thingsboard/server/dao/HsqlTsDaoConfig.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.dao;
 
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -23,9 +22,10 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.thingsboard.server.dao.util.HsqlDao;
 import org.thingsboard.server.dao.util.SqlTsDao;
+import org.thingsboard.server.dao.util.TbAutoConfiguration;
 
 @Configuration
-@EnableAutoConfiguration
+@TbAutoConfiguration
 @ComponentScan({"org.thingsboard.server.dao.sqlts.hsql"})
 @EnableJpaRepositories({"org.thingsboard.server.dao.sqlts.ts", "org.thingsboard.server.dao.sqlts.insert.hsql"})
 @EntityScan({"org.thingsboard.server.dao.model.sqlts.ts"})

dao/src/main/java/org/thingsboard/server/dao/HsqlTsLatestDaoConfig.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.dao;
 
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -23,9 +22,10 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.thingsboard.server.dao.util.HsqlDao;
 import org.thingsboard.server.dao.util.SqlTsLatestDao;
+import org.thingsboard.server.dao.util.TbAutoConfiguration;
 
 @Configuration
-@EnableAutoConfiguration
+@TbAutoConfiguration
 @ComponentScan({"org.thingsboard.server.dao.sqlts.hsql"})
 @EnableJpaRepositories({"org.thingsboard.server.dao.sqlts.insert.latest.hsql", "org.thingsboard.server.dao.sqlts.latest"})
 @EntityScan({"org.thingsboard.server.dao.model.sqlts.latest"})

dao/src/main/java/org/thingsboard/server/dao/JpaDaoConfig.java

@@ -15,18 +15,18 @@
  */
 package org.thingsboard.server.dao;
 
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.thingsboard.server.dao.util.TbAutoConfiguration;
 
 /**
  * @author Valerii Sosliuk
  */
 @Configuration
-@EnableAutoConfiguration
+@TbAutoConfiguration
 @ComponentScan("org.thingsboard.server.dao.sql")
 @EnableJpaRepositories("org.thingsboard.server.dao.sql")
 @EntityScan("org.thingsboard.server.dao.model.sql")

dao/src/main/java/org/thingsboard/server/dao/PsqlTsDaoConfig.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.dao;
 
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -23,9 +22,10 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.thingsboard.server.dao.util.PsqlDao;
 import org.thingsboard.server.dao.util.SqlTsDao;
+import org.thingsboard.server.dao.util.TbAutoConfiguration;
 
 @Configuration
-@EnableAutoConfiguration
+@TbAutoConfiguration
 @ComponentScan({"org.thingsboard.server.dao.sqlts.psql", "org.thingsboard.server.dao.sqlts.insert.psql"})
 @EnableJpaRepositories({"org.thingsboard.server.dao.sqlts.ts", "org.thingsboard.server.dao.sqlts.insert.psql"})
 @EntityScan({"org.thingsboard.server.dao.model.sqlts.ts"})

dao/src/main/java/org/thingsboard/server/dao/PsqlTsLatestDaoConfig.java

@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.dao;
 
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -23,9 +22,10 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.thingsboard.server.dao.util.PsqlDao;
 import org.thingsboard.server.dao.util.SqlTsLatestDao;
+import org.thingsboard.server.dao.util.TbAutoConfiguration;
 
 @Configuration
-@EnableAutoConfiguration
+@TbAutoConfiguration
 @ComponentScan({"org.thingsboard.server.dao.sqlts.psql"})
 @EnableJpaRepositories({"org.thingsboard.server.dao.sqlts.insert.latest.psql", "org.thingsboard.server.dao.sqlts.latest"})
 @EntityScan({"org.thingsboard.server.dao.model.sqlts.latest"})

dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java

@@ -15,16 +15,15 @@
  */
 package org.thingsboard.server.dao;
 
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.thingsboard.server.dao.util.PsqlDao;
 import org.thingsboard.server.dao.util.SqlTsOrTsLatestAnyDao;
+import org.thingsboard.server.dao.util.TbAutoConfiguration;
 
 @Configuration
-@EnableAutoConfiguration
+@TbAutoConfiguration
 @EnableJpaRepositories({"org.thingsboard.server.dao.sqlts.dictionary"})
 @EntityScan({"org.thingsboard.server.dao.model.sqlts.dictionary"})
 @EnableTransactionManagement

dao/src/main/java/org/thingsboard/server/dao/TimescaleDaoConfig.java

@@ -15,17 +15,17 @@
  */
 package org.thingsboard.server.dao;
 
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.thingsboard.server.dao.util.PsqlDao;
+import org.thingsboard.server.dao.util.TbAutoConfiguration;
 import org.thingsboard.server.dao.util.TimescaleDBTsDao;
 
 @Configuration
-@EnableAutoConfiguration
+@TbAutoConfiguration
 @ComponentScan({"org.thingsboard.server.dao.sqlts.timescale"})
 @EnableJpaRepositories({"org.thingsboard.server.dao.sqlts.timescale", "org.thingsboard.server.dao.sqlts.insert.timescale"})
 @EntityScan({"org.thingsboard.server.dao.model.sqlts.timescale"})

dao/src/main/java/org/thingsboard/server/dao/TimescaleTsLatestDaoConfig.java

@@ -15,17 +15,17 @@
  */
 package org.thingsboard.server.dao;
 
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.thingsboard.server.dao.util.PsqlDao;
+import org.thingsboard.server.dao.util.TbAutoConfiguration;
 import org.thingsboard.server.dao.util.TimescaleDBTsLatestDao;
 
 @Configuration
-@EnableAutoConfiguration
+@TbAutoConfiguration
 @ComponentScan({"org.thingsboard.server.dao.sqlts.timescale"})
 @EnableJpaRepositories({"org.thingsboard.server.dao.sqlts.insert.latest.psql", "org.thingsboard.server.dao.sqlts.latest"})
 @EntityScan({"org.thingsboard.server.dao.model.sqlts.latest"})

pom.xml

@@ -39,13 +39,13 @@
         <javax-annotation.version>1.3.2</javax-annotation.version>
         <jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version>
         <jaxb-runtime.version>2.3.2</jaxb-runtime.version>
-        <spring-boot.version>2.3.12.RELEASE</spring-boot.version>
-        <spring-data.version>2.3.9.RELEASE</spring-data.version>
-        <spring.version>5.2.16.RELEASE</spring.version>
-        <spring-redis.version>5.2.11.RELEASE</spring-redis.version>
-        <spring-security.version>5.4.7</spring-security.version>
-        <spring-data-redis.version>2.4.3</spring-data-redis.version>
-        <jedis.version>3.3.0</jedis.version>
+        <spring-boot.version>2.5.12</spring-boot.version>
+        <spring-data.version>2.5.10</spring-data.version>
+        <spring.version>5.3.18</spring.version>
+        <spring-redis.version>5.5.10</spring-redis.version>
+        <spring-security.version>5.6.2</spring-security.version>
+        <spring-data-redis.version>2.5.10</spring-data-redis.version>
+        <jedis.version>3.7.1</jedis.version>
         <jjwt.version>0.7.0</jjwt.version>
         <slf4j.version>1.7.32</slf4j.version>
         <log4j.version>2.17.1</log4j.version>
@@ -65,7 +65,7 @@
         <apache-httpclient.version>4.5.13</apache-httpclient.version>
         <apache-httpcore.version>4.4.14</apache-httpcore.version>
         <joda-time.version>2.8.1</joda-time.version>
-        <jackson.version>2.12.1</jackson.version>
+        <jackson.version>2.13.2</jackson.version>
         <fasterxml-classmate.version>1.3.4</fasterxml-classmate.version>
         <json-schema-validator.version>2.2.6</json-schema-validator.version>
         <californium.version>3.0.0</californium.version>
@@ -79,8 +79,8 @@
         <grpc.version>1.42.1</grpc.version>
         <lombok.version>1.18.18</lombok.version>
         <paho.client.version>1.2.4</paho.client.version>
-        <netty.version>4.1.72.Final</netty.version>
-        <netty-tcnative.version>2.0.46.Final</netty-tcnative.version>
+        <netty.version>4.1.75.Final</netty.version>
+        <netty-tcnative.version>2.0.51.Final</netty-tcnative.version>
         <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
         <rabbitmq.version>4.8.0</rabbitmq.version>
         <surfire.version>2.19.1</surfire.version>
@@ -112,7 +112,7 @@
         <ua-parser.version>1.4.3</ua-parser.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <commons-collections.version>3.2.2</commons-collections.version>
-        <micrometer.version>1.5.2</micrometer.version>
+        <micrometer.version>1.8.3</micrometer.version>
         <protobuf-dynamic.version>1.0.3TB</protobuf-dynamic.version>
         <wire-schema.version>3.4.0</wire-schema.version>
         <twilio.version>8.17.0</twilio.version>
@@ -127,7 +127,7 @@
         <dbunit.version>2.7.2</dbunit.version>
         <hsqldb.version>2.6.1</hsqldb.version>
         <java-websocket.version>1.5.2</java-websocket.version>
-        <jupiter.version>5.6.3</jupiter.version> <!-- keep the same version as spring-boot-starter-test depend on jupiter-->
+        <jupiter.version>5.7.2</jupiter.version> <!-- keep the same version as spring-boot-starter-test depend on jupiter-->
         <json-path.version>2.6.0</json-path.version>
         <spring-test-dbunit.version>1.3.0</spring-test-dbunit.version> <!-- 2016 -->
         <takari-cpsuite.version>1.2.7</takari-cpsuite.version> <!-- 2015 -->