lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[#1383] Spring Boot 3 migration Step 2: fix swagger (#1566)

Browse Source 
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com
This commit is contained in:
Avgustin Marinov
2024-01-26 15:41:43 +02:00
committed by GitHub
parent fc3cbe52ec
commit d3cab9a326
5 changed files with 8 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hawkbit-rest/hawkbit-ddi-api/pom.xml
View File

@@ -43,18 +43,9 @@
<artifactId>hawkbit-rest-core</artifactId> <artifactId>hawkbit-rest-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- Swagger Support -->
<dependency> <dependency>
<groupId>org.springdoc</groupId> <groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId> <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-hateoas</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-security</artifactId>
</dependency> </dependency>
<!-- TEST --> <!-- TEST -->

11
hawkbit-rest/hawkbit-mgmt-api/pom.xml
View File

@@ -32,18 +32,9 @@
<groupId>org.springframework.hateoas</groupId> <groupId>org.springframework.hateoas</groupId>
<artifactId>spring-hateoas</artifactId> <artifactId>spring-hateoas</artifactId>
</dependency> </dependency>
<!-- Swagger Support -->
<dependency> <dependency>
<groupId>org.springdoc</groupId> <groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId> <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-hateoas</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-security</artifactId>
</dependency> </dependency>
<dependency> <dependency>

10
hawkbit-rest/hawkbit-rest-core/pom.xml
View File

@@ -53,15 +53,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springdoc</groupId> <groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId> <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-hateoas</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-security</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>jakarta.servlet</groupId>

7
hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApiConfiguration.java
View File

@@ -9,12 +9,11 @@
*/ */
package org.eclipse.hawkbit.rest; package org.eclipse.hawkbit.rest;
import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityRequirement;
import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.security.SecurityScheme;
import org.springdoc.core.GroupedOpenApi; import org.springdoc.core.models.GroupedOpenApi;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@@ -51,7 +50,7 @@ public class OpenApiConfiguration {
.builder() .builder()
.group("Management API") .group("Management API")
.pathsToMatch("/rest/v1/**") .pathsToMatch("/rest/v1/**")
.addOpenApiCustomiser(openApi -> { .addOpenApiCustomizer(openApi -> {
openApi openApi
.addSecurityItem(new SecurityRequirement() .addSecurityItem(new SecurityRequirement()
.addList(BASIC_AUTH_SEC_SCHEME_NAME) .addList(BASIC_AUTH_SEC_SCHEME_NAME)
@@ -85,7 +84,7 @@ public class OpenApiConfiguration {
.builder() .builder()
.group("Direct Device Integration API") .group("Direct Device Integration API")
.pathsToMatch("/{tenant}/controller/**") .pathsToMatch("/{tenant}/controller/**")
.addOpenApiCustomiser(openApi -> { .addOpenApiCustomizer(openApi -> {
openApi openApi
.addSecurityItem(new SecurityRequirement().addList(DDI_TOKEN_SEC_SCHEME_NAME)) .addSecurityItem(new SecurityRequirement().addList(DDI_TOKEN_SEC_SCHEME_NAME))
.components( .components(

16
pom.xml
View File

@@ -144,10 +144,9 @@
<spring.boot.version>3.2.1</spring.boot.version> <spring.boot.version>3.2.1</spring.boot.version>
<spring.cloud.version>2023.0.0</spring.cloud.version> <spring.cloud.version>2023.0.0</spring.cloud.version>
<springdoc-openapi.version>2.3.0</springdoc-openapi.version>
<spring.plugin.core.version>3.0.0</spring.plugin.core.version> <spring.plugin.core.version>3.0.0</spring.plugin.core.version>
<!-- Swagger Support -->
<springdoc-openapi.version>1.7.0</springdoc-openapi.version>
<!-- Spring boot version overrides (should be reviewed with every boot upgrade) - START --> <!-- Spring boot version overrides (should be reviewed with every boot upgrade) - START -->
<!-- Newer versions needed than defined in Boot --> <!-- Newer versions needed than defined in Boot -->
@@ -732,20 +731,9 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- Swagger Support -->
<dependency> <dependency>
<groupId>org.springdoc</groupId> <groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId> <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc-openapi.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-hateoas</artifactId>
<version>${springdoc-openapi.version}</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-security</artifactId>
<version>${springdoc-openapi.version}</version> <version>${springdoc-openapi.version}</version>
</dependency> </dependency>