Merge branch 'master' into fix/3984-data-mapping-crushing

application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java

@@ -48,6 +48,7 @@ import org.springdoc.core.models.GroupedOpenApi;
 import org.springdoc.core.properties.SpringDocConfigProperties;
 import org.springdoc.core.properties.SwaggerUiConfigProperties;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
@@ -62,7 +63,6 @@ import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.exception.ThingsboardCredentialsExpiredResponse;
 import org.thingsboard.server.exception.ThingsboardErrorResponse;
-import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.auth.rest.LoginRequest;
 import org.thingsboard.server.service.security.auth.rest.LoginResponse;
 
@@ -79,7 +79,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 @Slf4j
 @Configuration
-@TbCoreComponent
+@ConditionalOnExpression("('${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core') && '${springdoc.api-docs.enabled:true}'=='true'")
 @Profile("!test")
 public class SwaggerConfiguration {
 
@@ -113,7 +113,8 @@ public class SwaggerConfiguration {
     private String version;
     @Value("${app.version:unknown}")
     private String appVersion;
-
+    @Value("${swagger.group_name:thingsboard}")
+    private String groupName;
 
     @Bean
     public OpenAPI thingsboardApi() {
@@ -212,7 +213,7 @@ public class SwaggerConfiguration {
     @Bean
     public GroupedOpenApi groupedApi(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
         return GroupedOpenApi.builder()
-                .group("thingsboard")
+                .group(groupName)
                 .pathsToMatch(apiPath)
                 .addRouterOperationCustomizer(routerOperationCustomizer(localSpringDocParameterNameDiscoverer))
                 .addOperationCustomizer(operationCustomizer())

application/src/main/resources/thingsboard.yml

@@ -1385,6 +1385,8 @@ swagger:
     url: "${SWAGGER_LICENSE_URL:https://github.com/thingsboard/thingsboard/blob/master/LICENSE}"
   # The version of the API doc to display. Default to the package version.
   version: "${SWAGGER_VERSION:}"
+  # The group name (definition) on the API doc UI page.
+  group_name: "${SWAGGER_GROUP_NAME:thingsboard}"
 
 # Queue configuration parameters
 queue: