Browse Source

fixed ByteBuffer fields for openapi schema

pull/15196/head
dashevchenko 7 months ago
parent
commit
31d6b20944
  1. 4
      application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
  2. 2
      common/data/src/main/java/org/thingsboard/server/common/data/OtaPackage.java

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

@ -48,6 +48,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springdoc.core.customizers.OpenApiCustomizer; import org.springdoc.core.customizers.OpenApiCustomizer;
import org.springdoc.core.customizers.OperationCustomizer; import org.springdoc.core.customizers.OperationCustomizer;
import org.springdoc.core.discoverer.SpringDocParameterNameDiscoverer; import org.springdoc.core.discoverer.SpringDocParameterNameDiscoverer;
import org.springdoc.core.utils.SpringDocUtils;
import org.springdoc.core.models.GroupedOpenApi; import org.springdoc.core.models.GroupedOpenApi;
import org.springdoc.core.properties.SpringDocConfigProperties; import org.springdoc.core.properties.SpringDocConfigProperties;
import org.springdoc.core.properties.SwaggerUiConfigProperties; import org.springdoc.core.properties.SwaggerUiConfigProperties;
@ -69,6 +70,7 @@ import org.thingsboard.server.service.security.auth.rest.LoginResponse;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.nio.ByteBuffer;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -94,6 +96,8 @@ public class SwaggerConfiguration {
@PostConstruct @PostConstruct
public void configureModelResolver() { public void configureModelResolver() {
ModelResolver.enumsAsRef = true; ModelResolver.enumsAsRef = true;
SpringDocUtils.getConfig().replaceWithSchema(ByteBuffer.class,
new Schema<String>().type("string").format("byte"));
} }
public static final String LOGIN_ENDPOINT = "/api/auth/login"; public static final String LOGIN_ENDPOINT = "/api/auth/login";

2
common/data/src/main/java/org/thingsboard/server/common/data/OtaPackage.java

@ -31,7 +31,7 @@ public class OtaPackage extends OtaPackageInfo {
@Serial @Serial
private static final long serialVersionUID = 3091601761339422546L; private static final long serialVersionUID = 3091601761339422546L;
@Schema(description = "OTA Package data.", accessMode = Schema.AccessMode.READ_ONLY, type = "string", format = "byte") @Schema(description = "OTA Package data.", accessMode = Schema.AccessMode.READ_ONLY)
private transient ByteBuffer data; private transient ByteBuffer data;
public OtaPackage() { public OtaPackage() {

Loading…
Cancel
Save