This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 7cb81e13c [SCB-2813]fix some compile warnings (#4036)
7cb81e13c is described below
commit 7cb81e13cc6c383df3967a436f61c5f57c9c19c6
Author: liubao68 <[email protected]>
AuthorDate: Thu Nov 16 15:13:17 2023 +0800
[SCB-2813]fix some compile warnings (#4036)
---
.../schema/TestSchemaToProtoGenerator.java | 10 +--
.../config/BootStrapPropertiesTest.java | 97 ++++++++++------------
.../test/scaffolding/log/LogCollector.java | 16 ++--
.../springmvc/reference/CseClientHttpResponse.java | 2 +
.../lightweight/AbstractLightweightDiscovery.java | 9 +-
.../AbstractLightweightRegistration.java | 6 +-
.../zeroconfig/AbstractZeroConfigRegistration.java | 2 +-
.../property/ObjectPropertyConverter.java | 2 +-
.../swagger/extend/ModelResolverExt.java | 2 +-
.../property/creator/ByteArrayPropertyCreator.java | 2 +-
.../property/creator/BytePropertyCreator.java | 2 +-
.../creator/InputStreamPropertyCreator.java | 2 +-
.../property/creator/PartPropertyCreator.java | 5 +-
.../extend/property/creator/PropertyCreator.java | 2 +-
.../swagger/generator/ResponseTypeProcessor.java | 6 +-
.../generator/core/AbstractOperationGenerator.java | 2 +-
.../response/DefaultResponseTypeProcessor.java | 5 +-
.../swagger/generator/core/TestArrayType.java | 4 +-
.../OperationMethodAnnotationProcessorTest.java | 2 +-
.../creator/MultipartFilePropertyCreator.java | 2 +-
20 files changed, 83 insertions(+), 97 deletions(-)
diff --git
a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java
b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java
index 930de8284..2921ff523 100644
---
a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java
+++
b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/schema/TestSchemaToProtoGenerator.java
@@ -51,8 +51,7 @@ public class TestSchemaToProtoGenerator {
message input {
string value = 1;
}
-
- """, new ProtoToStringGenerator(proto).protoToString());
+ """.trim(), new ProtoToStringGenerator(proto).protoToString().trim());
}
@Test
@@ -83,8 +82,7 @@ public class TestSchemaToProtoGenerator {
message input {
User value = 1;
}
-
- """, new ProtoToStringGenerator(proto).protoToString());
+ """.trim(), new ProtoToStringGenerator(proto).protoToString().trim());
}
static class Model {
@@ -247,7 +245,7 @@ public class TestSchemaToProtoGenerator {
message request {
UserInfo value = 1;
}
- """.trim(), new ProtoToStringGenerator(proto).protoToString().trim());
+ """.trim(), new ProtoToStringGenerator(proto).protoToString().trim());
}
@Test
@@ -288,7 +286,7 @@ public class TestSchemaToProtoGenerator {
message request {
repeated DeptInfo value = 1;
}
- """.trim(), new ProtoToStringGenerator(proto).protoToString().trim());
+ """.trim(), new ProtoToStringGenerator(proto).protoToString().trim());
}
@Test
diff --git
a/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/BootStrapPropertiesTest.java
b/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/BootStrapPropertiesTest.java
index 996cbcdb8..38a8a4a8b 100644
---
a/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/BootStrapPropertiesTest.java
+++
b/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/BootStrapPropertiesTest.java
@@ -20,15 +20,12 @@ package org.apache.servicecomb.config;
import static
org.apache.servicecomb.foundation.test.scaffolding.AssertUtils.assertPrettyJson;
import static org.assertj.core.api.Assertions.assertThat;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.MutablePropertySources;
@@ -37,14 +34,12 @@ public class BootStrapPropertiesTest {
Map<String, Object> properties = YAMLUtil.yaml2Properties(yaml);
ConfigurableEnvironment environment =
Mockito.mock(ConfigurableEnvironment.class);
MutablePropertySources mutablePropertySources = new
MutablePropertySources();
- EnumerablePropertySource propertySource = new MapPropertySource("yaml",
properties);
+ MapPropertySource propertySource = new MapPropertySource("yaml",
properties);
mutablePropertySources.addLast(propertySource);
Mockito.when(environment.getPropertySources()).thenReturn(mutablePropertySources);
- List<String> keys = new ArrayList<>();
for (Entry<String, Object> entry : properties.entrySet()) {
Mockito.when(environment.getProperty(entry.getKey())).thenReturn(entry.getValue().toString());
- keys.add(entry.getKey());
}
return BootStrapProperties.readServiceInstanceProperties(environment);
@@ -59,62 +54,62 @@ public class BootStrapPropertiesTest {
@Test
void should_read_boolean_to_string() {
- Map<String, String> properties = readInstanceProperties(""
- + "servicecomb:\n"
- + " instance:\n"
- + " properties:\n"
- + " k: true");
-
- assertPrettyJson(properties).isEqualTo(""
- + "{\n"
- + " \"k\" : \"true\"\n"
- + "}");
+ Map<String, String> properties = readInstanceProperties("""
+ servicecomb:
+ instance:
+ properties:
+ k: true""");
+
+ assertPrettyJson(properties).isEqualTo("""
+ {
+ "k" : "true"
+ }""");
}
@Test
void should_read_number_to_string() {
- Map<String, String> properties = readInstanceProperties(""
- + "servicecomb:\n"
- + " instance:\n"
- + " properties:\n"
- + " k: 1");
-
- assertPrettyJson(properties).isEqualTo(""
- + "{\n"
- + " \"k\" : \"1\"\n"
- + "}");
+ Map<String, String> properties = readInstanceProperties("""
+ servicecomb:
+ instance:
+ properties:
+ k: 1""");
+
+ assertPrettyJson(properties).isEqualTo("""
+ {
+ "k" : "1"
+ }""");
}
@Test
void should_read_by_old_prefix_when_new_prefix_not_exists() {
- Map<String, String> properties = readInstanceProperties(""
- + "instance_description:\n"
- + " properties:\n"
- + " k: v\n"
- + " k1: v1");
-
- assertPrettyJson(properties).isEqualTo(""
- + "{\n"
- + " \"k1\" : \"v1\",\n"
- + " \"k\" : \"v\"\n"
- + "}");
+ Map<String, String> properties = readInstanceProperties("""
+ instance_description:
+ properties:
+ k: v
+ k1: v1""");
+
+ assertPrettyJson(properties).isEqualTo("""
+ {
+ "k1" : "v1",
+ "k" : "v"
+ }""");
}
@Test
void should_ignore_old_prefix_when_new_prefix_exists() {
- Map<String, String> properties = readInstanceProperties(""
- + "instance_description:\n"
- + " properties:\n"
- + " k: v\n"
- + " k1: v1\n"
- + "servicecomb:\n"
- + " instance:\n"
- + " properties:\n"
- + " k: new");
-
- assertPrettyJson(properties).isEqualTo(""
- + "{\n"
- + " \"k\" : \"new\"\n"
- + "}");
+ Map<String, String> properties = readInstanceProperties("""
+ instance_description:
+ properties:
+ k: v
+ k1: v1
+ servicecomb:
+ instance:
+ properties:
+ k: new""");
+
+ assertPrettyJson(properties).isEqualTo("""
+ {
+ "k" : "new"
+ }""");
}
}
diff --git
a/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/log/LogCollector.java
b/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/log/LogCollector.java
index 691e6d611..a01032939 100644
---
a/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/log/LogCollector.java
+++
b/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/log/LogCollector.java
@@ -16,6 +16,12 @@
*/
package org.apache.servicecomb.foundation.test.scaffolding.log;
+import java.io.Closeable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
@@ -23,18 +29,14 @@ import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.layout.PatternLayout;
-import java.io.Closeable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
public class LogCollector implements Closeable {
List<LogEvent> events = new ArrayList<>();
- Appender appender = new AbstractAppender("LogCollector", null,
PatternLayout.createDefaultLayout()) {
+ Appender appender = new AbstractAppender("LogCollector", null,
PatternLayout.createDefaultLayout(), true,
+ Property.EMPTY_ARRAY) {
@Override
public void append(LogEvent event) {
events.add(event);
diff --git
a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpResponse.java
b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpResponse.java
index c2599a929..e3caf103b 100644
---
a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpResponse.java
+++
b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpResponse.java
@@ -94,6 +94,8 @@ public class CseClientHttpResponse implements
ClientHttpResponse {
}
@Override
+ @Deprecated(since = "6.0")
+ @SuppressWarnings("deprecations")
public int getRawStatusCode() throws IOException {
return response.getStatusCode();
}
diff --git
a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightDiscovery.java
b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightDiscovery.java
index 897e1b7c5..f52e83455 100644
---
a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightDiscovery.java
+++
b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightDiscovery.java
@@ -25,18 +25,13 @@ import org.springframework.core.env.Environment;
import com.google.common.eventbus.EventBus;
-@SuppressWarnings("UnstableApiUsage")
public abstract class AbstractLightweightDiscovery<D extends
DiscoveryInstance> implements Discovery<D> {
- public static final String ZERO_CONFIG_NAME = "zero-config-discovery";
-
public static final String ZERO_DISCOVERY_ENABLED =
"servicecomb.registry.zero-config.%s.%s.enabled";
protected EventBus eventBus;
protected Store store;
- protected String revision;
-
private Environment environment;
@Autowired
@@ -45,13 +40,13 @@ public abstract class AbstractLightweightDiscovery<D
extends DiscoveryInstance>
}
@Autowired
- public AbstractLightweightDiscovery setEventBus(EventBus eventBus) {
+ public AbstractLightweightDiscovery<D> setEventBus(EventBus eventBus) {
this.eventBus = eventBus;
return this;
}
@Autowired
- public AbstractLightweightDiscovery setStore(Store store) {
+ public AbstractLightweightDiscovery<D> setStore(Store store) {
this.store = store;
return this;
}
diff --git
a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightRegistration.java
b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightRegistration.java
index 301beb38d..06aa7c9b7 100644
---
a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightRegistration.java
+++
b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/AbstractLightweightRegistration.java
@@ -42,19 +42,19 @@ public abstract class AbstractLightweightRegistration<R
extends RegistrationInst
protected Self self;
@Autowired
- public AbstractLightweightRegistration setEventBus(EventBus eventBus) {
+ public AbstractLightweightRegistration<R> setEventBus(EventBus eventBus) {
this.eventBus = eventBus;
return this;
}
@Autowired
- public AbstractLightweightRegistration setStoreService(StoreService
storeService) {
+ public AbstractLightweightRegistration<R> setStoreService(StoreService
storeService) {
this.storeService = storeService;
return this;
}
@Autowired
- public AbstractLightweightRegistration setSelf(Self self) {
+ public AbstractLightweightRegistration<R> setSelf(Self self) {
this.self = self;
return this;
}
diff --git
a/service-registry/registry-zero-config/src/main/java/org/apache/servicecomb/zeroconfig/AbstractZeroConfigRegistration.java
b/service-registry/registry-zero-config/src/main/java/org/apache/servicecomb/zeroconfig/AbstractZeroConfigRegistration.java
index f0a589480..b6e577e44 100644
---
a/service-registry/registry-zero-config/src/main/java/org/apache/servicecomb/zeroconfig/AbstractZeroConfigRegistration.java
+++
b/service-registry/registry-zero-config/src/main/java/org/apache/servicecomb/zeroconfig/AbstractZeroConfigRegistration.java
@@ -28,7 +28,7 @@ public abstract class AbstractZeroConfigRegistration<R
extends RegistrationInsta
protected Config config;
@Autowired
- public AbstractZeroConfigRegistration setConfig(Config config) {
+ public AbstractZeroConfigRegistration<R> setConfig(Config config) {
this.config = config;
return this;
}
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/converter/property/ObjectPropertyConverter.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/converter/property/ObjectPropertyConverter.java
index d3317131f..3564ca4bd 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/converter/property/ObjectPropertyConverter.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/converter/property/ObjectPropertyConverter.java
@@ -30,7 +30,7 @@ public class ObjectPropertyConverter extends
AbstractConverter {
@Override
protected Map<String, Object> findVendorExtensions(Object def) {
- return ((Schema) def).getExtensions();
+ return ((Schema<?>) def).getExtensions();
}
@Override
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ModelResolverExt.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ModelResolverExt.java
index 35d8ceb7d..a11143175 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ModelResolverExt.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ModelResolverExt.java
@@ -98,7 +98,7 @@ public class ModelResolverExt extends ModelResolver {
@Override
- public Schema resolve(AnnotatedType propType, ModelConverterContext context,
Iterator<ModelConverter> next) {
+ public Schema<?> resolve(AnnotatedType propType, ModelConverterContext
context, Iterator<ModelConverter> next) {
PropertyCreator creator = propertyCreatorMap.get(propType.getType());
if (creator != null) {
return creator.createProperty();
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/ByteArrayPropertyCreator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/ByteArrayPropertyCreator.java
index 20db68f85..768a07a41 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/ByteArrayPropertyCreator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/ByteArrayPropertyCreator.java
@@ -30,7 +30,7 @@ public class ByteArrayPropertyCreator implements
PropertyCreator {
private final Class<?>[] classes = {Byte[].class, byte[].class};
@Override
- public Schema createProperty() {
+ public Schema<?> createProperty() {
return new ByteArraySchema();
}
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/BytePropertyCreator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/BytePropertyCreator.java
index 65b728bfa..66e53e678 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/BytePropertyCreator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/BytePropertyCreator.java
@@ -31,7 +31,7 @@ public class BytePropertyCreator implements PropertyCreator {
private final Class<?>[] classes = {Byte.class, byte.class};
@Override
- public Schema createProperty() {
+ public Schema<?> createProperty() {
return new IntegerSchema();
}
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/InputStreamPropertyCreator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/InputStreamPropertyCreator.java
index 4231c1d63..8a0556c14 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/InputStreamPropertyCreator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/InputStreamPropertyCreator.java
@@ -27,7 +27,7 @@ public class InputStreamPropertyCreator implements
PropertyCreator {
private final Class<?>[] classes = {InputStream.class};
@Override
- public Schema createProperty() {
+ public Schema<?> createProperty() {
return new ByteArraySchema();
}
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/PartPropertyCreator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/PartPropertyCreator.java
index 61060b13c..3a489e5f7 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/PartPropertyCreator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/PartPropertyCreator.java
@@ -17,16 +17,15 @@
package org.apache.servicecomb.swagger.extend.property.creator;
-import jakarta.servlet.http.Part;
-
import io.swagger.v3.oas.models.media.FileSchema;
import io.swagger.v3.oas.models.media.Schema;
+import jakarta.servlet.http.Part;
public class PartPropertyCreator implements PropertyCreator {
private final Class<?>[] classes = {Part.class};
@Override
- public Schema createProperty() {
+ public Schema<?> createProperty() {
return new FileSchema();
}
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/PropertyCreator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/PropertyCreator.java
index 671b9dc8a..52629ed78 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/PropertyCreator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/PropertyCreator.java
@@ -21,7 +21,7 @@ import io.swagger.v3.oas.models.media.Schema;
@SuppressWarnings({"rawtypes"})
public interface PropertyCreator {
- Schema createProperty();
+ Schema<?> createProperty();
Class<?>[] classes();
}
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/ResponseTypeProcessor.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/ResponseTypeProcessor.java
index 60ec44de4..a1efa5112 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/ResponseTypeProcessor.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/ResponseTypeProcessor.java
@@ -24,10 +24,6 @@ public interface ResponseTypeProcessor {
Type getProcessType();
/**
- *
- * @param swaggerGenerator
- * @param operationGenerator
- * @param genericResponseType
* @return if genericResponseType is CompletableFuture<String>, then
return String
*/
Type extractResponseType(SwaggerGenerator swaggerGenerator,
OperationGenerator operationGenerator,
@@ -37,5 +33,5 @@ public interface ResponseTypeProcessor {
return extractResponseType(null, null, genericResponseType);
}
- Schema process(SwaggerGenerator swaggerGenerator, OperationGenerator
operationGenerator, Type genericResponseType);
+ Schema<?> process(SwaggerGenerator swaggerGenerator, OperationGenerator
operationGenerator, Type genericResponseType);
}
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractOperationGenerator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractOperationGenerator.java
index f23a4d91d..d70027593 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractOperationGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractOperationGenerator.java
@@ -410,7 +410,7 @@ public abstract class AbstractOperationGenerator implements
OperationGenerator {
}
}
- protected Schema createResponseModel() {
+ protected Schema<?> createResponseModel() {
Type responseType =
TypeToken.of(clazz)
.resolveType(method.getGenericReturnType())
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/response/DefaultResponseTypeProcessor.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/response/DefaultResponseTypeProcessor.java
index 6b4bee3f9..46788ae8e 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/response/DefaultResponseTypeProcessor.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/response/DefaultResponseTypeProcessor.java
@@ -21,8 +21,6 @@ import static
org.apache.servicecomb.swagger.generator.SwaggerGeneratorUtils.fin
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import jakarta.servlet.http.Part;
-
import org.apache.servicecomb.swagger.SwaggerUtils;
import org.apache.servicecomb.swagger.generator.OperationGenerator;
import org.apache.servicecomb.swagger.generator.ResponseTypeProcessor;
@@ -30,6 +28,7 @@ import
org.apache.servicecomb.swagger.generator.SwaggerGenerator;
import io.swagger.v3.core.util.ReflectionUtils;
import io.swagger.v3.oas.models.media.Schema;
+import jakarta.servlet.http.Part;
public class DefaultResponseTypeProcessor implements ResponseTypeProcessor {
protected boolean extractActualType;
@@ -73,7 +72,7 @@ public class DefaultResponseTypeProcessor implements
ResponseTypeProcessor {
}
@Override
- public Schema process(SwaggerGenerator swaggerGenerator, OperationGenerator
operationGenerator,
+ public Schema<?> process(SwaggerGenerator swaggerGenerator,
OperationGenerator operationGenerator,
Type genericResponseType) {
Type responseType = extractResponseType(swaggerGenerator,
operationGenerator, genericResponseType);
if (responseType == null || ReflectionUtils.isVoid(responseType)) {
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
index c36e27f68..931fe3da9 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestArrayType.java
@@ -35,11 +35,11 @@ public class TestArrayType {
SwaggerOperations swaggerOperations =
SwaggerOperations.generate(ArrayType.class);
SwaggerOperation swaggerOperation =
swaggerOperations.findOperation("testBytes");
RequestBody bodyParameter =
swaggerOperation.getOperation().getRequestBody();
- Schema model =
bodyParameter.getContent().get(MediaType.APPLICATION_JSON).getSchema();
+ Schema<?> model =
bodyParameter.getContent().get(MediaType.APPLICATION_JSON).getSchema();
Assertions.assertEquals(Components.COMPONENTS_SCHEMAS_REF +
"testBytesBody", model.get$ref());
OpenAPI openAPI = swaggerOperation.getSwagger();
- Schema schema = openAPI.getComponents().getSchemas().get("testBytesBody");
+ Schema<?> schema =
openAPI.getComponents().getSchemas().get("testBytesBody");
Assertions.assertEquals(1, schema.getProperties().size());
ByteArraySchema arrayProperty = (ByteArraySchema)
schema.getProperties().get("value");
diff --git
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/OperationMethodAnnotationProcessorTest.java
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/OperationMethodAnnotationProcessorTest.java
index b4720f15d..e164a97ca 100644
---
a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/OperationMethodAnnotationProcessorTest.java
+++
b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/OperationMethodAnnotationProcessorTest.java
@@ -174,7 +174,7 @@ public class OperationMethodAnnotationProcessorTest {
@Test
public void testBodyParam() {
SwaggerOperation swaggerOperation =
swaggerOperations.findOperation("testBodyParam");
- io.swagger.v3.oas.models.media.Schema schema =
swaggerOperation.getSwagger()
+ io.swagger.v3.oas.models.media.Schema<?> schema =
swaggerOperation.getSwagger()
.getPaths().get("/testBodyParam").getPost().getRequestBody().getContent()
.get(MediaType.APPLICATION_JSON).getSchema();
Assertions.assertEquals(Components.COMPONENTS_SCHEMAS_REF +
"TestBodyBean", schema.get$ref());
diff --git
a/swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/property/creator/MultipartFilePropertyCreator.java
b/swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/property/creator/MultipartFilePropertyCreator.java
index fd010c175..6666f7813 100644
---
a/swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/property/creator/MultipartFilePropertyCreator.java
+++
b/swagger/swagger-generator/generator-springmvc/src/main/java/org/apache/servicecomb/swagger/generator/springmvc/property/creator/MultipartFilePropertyCreator.java
@@ -27,7 +27,7 @@ public class MultipartFilePropertyCreator implements
PropertyCreator {
private final Class<?>[] classes = {MultipartFile.class};
@Override
- public Schema createProperty() {
+ public Schema<?> createProperty() {
return new FileSchema();
}
