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 84ba536e3 [#4417]just remove some not used code (#4419)
84ba536e3 is described below
commit 84ba536e304cddb579a704bd025c3bae8b7422dd
Author: liubao68 <[email protected]>
AuthorDate: Fri Jul 19 17:33:22 2024 +0800
[#4417]just remove some not used code (#4419)
---
.../core/invocation/endpoint/EndpointTest.java | 3 -
.../swagger/extend/ModelResolverExt.java | 4 +-
.../swagger/generator/SwaggerGenerator.java | 2 -
.../swagger/generator/SwaggerGeneratorFeature.java | 66 ----------------------
.../generator/core/AbstractSwaggerGenerator.java | 38 +++----------
.../core/unittest/UnitTestSwaggerUtils.java | 1 -
6 files changed, 10 insertions(+), 104 deletions(-)
diff --git
a/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointTest.java
b/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointTest.java
index 44b63c837..a28a2be42 100644
---
a/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointTest.java
+++
b/core/src/test/java/org/apache/servicecomb/core/invocation/endpoint/EndpointTest.java
@@ -44,9 +44,6 @@ public class EndpointTest {
@Test
void should_ignore_endpoint_when_generate_swagger() {
SwaggerGenerator generator = SwaggerGenerator.create(TestSchema.class);
- generator.getSwaggerGeneratorFeature()
- .setExtJavaInterfaceInVendor(false)
- .setExtJavaClassInVendor(false);
OpenAPI swagger = generator.generate();
assertThat(SwaggerUtils.swaggerToString(swagger))
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 a11143175..8caec2dd1 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
@@ -36,7 +36,6 @@ import
org.apache.servicecomb.swagger.extend.property.creator.InputStreamPropert
import
org.apache.servicecomb.swagger.extend.property.creator.PartPropertyCreator;
import org.apache.servicecomb.swagger.extend.property.creator.PropertyCreator;
import org.apache.servicecomb.swagger.generator.SwaggerConst;
-import org.apache.servicecomb.swagger.generator.SwaggerGeneratorFeature;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -109,8 +108,7 @@ public class ModelResolverExt extends ModelResolver {
}
Schema result = super.resolve(propType, context, next);
- if (SwaggerGeneratorFeature.isLocalExtJavaClassInVendor()
- && !StringUtils.isEmpty(result.get$ref())) {
+ if (!StringUtils.isEmpty(result.get$ref())) {
Schema referencedSchema = context.getDefinedModels() != null
?
context.getDefinedModels().get(SwaggerUtils.getSchemaName(result.get$ref())) :
null;
if (referencedSchema != null) {
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGenerator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGenerator.java
index b11d8ffa7..cc9bbaaa5 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGenerator.java
@@ -45,8 +45,6 @@ public interface SwaggerGenerator {
throw new IllegalStateException("impossible, must be bug. can not generate
swagger for " + cls.getName());
}
- SwaggerGeneratorFeature getSwaggerGeneratorFeature();
-
SwaggerGeneratorContext getSwaggerGeneratorContext();
/**
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGeneratorFeature.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGeneratorFeature.java
deleted file mode 100644
index 398e5f546..000000000
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerGeneratorFeature.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.apache.servicecomb.swagger.generator;
-
-public class SwaggerGeneratorFeature {
- private static final ThreadLocal<SwaggerGeneratorFeature> featureThreadLocal
= new ThreadLocal<>();
-
- public static ThreadLocal<SwaggerGeneratorFeature> getFeatureThreadLocal() {
- return featureThreadLocal;
- }
-
- public static boolean isLocalExtJavaClassInVendor() {
- SwaggerGeneratorFeature feature = featureThreadLocal.get();
- return feature != null ? feature.extJavaClassInVendor : true;
- }
-
- // packageName and extJavaInVender is unnecessary, new invocation mechanism
not depend them
- // just remain them for compatible
- private String packageName = "gen.swagger";
-
- private boolean extJavaClassInVendor = true;
-
- private boolean extJavaInterfaceInVendor = true;
-
- public String getPackageName() {
- return packageName;
- }
-
- public void setPackageName(String packageName) {
- this.packageName = packageName;
- }
-
- public boolean isExtJavaClassInVendor() {
- return extJavaClassInVendor;
- }
-
- public SwaggerGeneratorFeature setExtJavaClassInVendor(boolean
extJavaClassInVendor) {
- this.extJavaClassInVendor = extJavaClassInVendor;
-
- return this;
- }
-
- public boolean isExtJavaInterfaceInVendor() {
- return extJavaInterfaceInVendor;
- }
-
- public SwaggerGeneratorFeature setExtJavaInterfaceInVendor(boolean
extJavaInterfaceInVendor) {
- this.extJavaInterfaceInVendor = extJavaInterfaceInVendor;
-
- return this;
- }
-}
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGenerator.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGenerator.java
index 5d1388641..654941844 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGenerator.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGenerator.java
@@ -36,7 +36,6 @@ import
org.apache.servicecomb.config.inject.PlaceholderResolver;
import org.apache.servicecomb.swagger.generator.ClassAnnotationProcessor;
import org.apache.servicecomb.swagger.generator.OperationGenerator;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
-import org.apache.servicecomb.swagger.generator.SwaggerGeneratorFeature;
import org.apache.servicecomb.swagger.generator.core.utils.MethodUtils;
import io.swagger.v3.oas.annotations.Operation;
@@ -57,8 +56,6 @@ import io.swagger.v3.oas.models.servers.Server;
* </pre>
*/
public abstract class AbstractSwaggerGenerator implements SwaggerGenerator {
- protected SwaggerGeneratorFeature swaggerGeneratorFeature = new
SwaggerGeneratorFeature();
-
protected SwaggerGeneratorContext swaggerGeneratorContext = new
SwaggerGeneratorContext();
protected Class<?> cls;
@@ -102,11 +99,6 @@ public abstract class AbstractSwaggerGenerator implements
SwaggerGenerator {
this.httpMethod = httpMethod.toUpperCase(Locale.US);
}
- @Override
- public SwaggerGeneratorFeature getSwaggerGeneratorFeature() {
- return swaggerGeneratorFeature;
- }
-
@Override
public SwaggerGeneratorContext getSwaggerGeneratorContext() {
return swaggerGeneratorContext;
@@ -116,33 +108,21 @@ public abstract class AbstractSwaggerGenerator implements
SwaggerGenerator {
LOGGER.info("generate schema from [{}]", cls);
scanClassAnnotation();
- ThreadLocal<SwaggerGeneratorFeature> featureThreadLocal =
SwaggerGeneratorFeature.getFeatureThreadLocal();
- featureThreadLocal.set(swaggerGeneratorFeature);
- try {
- scanMethods();
- addOperationsToSwagger();
+ scanMethods();
+ addOperationsToSwagger();
- correctSwagger();
+ correctSwagger();
- return openAPI;
- } finally {
- featureThreadLocal.remove();
- }
+ return openAPI;
}
public void scanClassAnnotation() {
- ThreadLocal<SwaggerGeneratorFeature> featureThreadLocal =
SwaggerGeneratorFeature.getFeatureThreadLocal();
- featureThreadLocal.set(swaggerGeneratorFeature);
- try {
- for (Annotation annotation : cls.getAnnotations()) {
- ClassAnnotationProcessor<Annotation> processor =
findClassAnnotationProcessor(annotation.annotationType());
- if (processor == null) {
- continue;
- }
- processor.process(this, annotation);
+ for (Annotation annotation : cls.getAnnotations()) {
+ ClassAnnotationProcessor<Annotation> processor =
findClassAnnotationProcessor(annotation.annotationType());
+ if (processor == null) {
+ continue;
}
- } finally {
- featureThreadLocal.remove();
+ processor.process(this, annotation);
}
}
diff --git
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java
index 20db8307f..9448484b0 100644
---
a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java
+++
b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/unittest/UnitTestSwaggerUtils.java
@@ -71,7 +71,6 @@ public final class UnitTestSwaggerUtils {
public static SwaggerGenerator testSwagger(String resPath, Class<?> cls,
String... methods) {
SwaggerGenerator generator = SwaggerGenerator.create(cls);
generator.replaceMethodWhiteList(methods);
- generator.getSwaggerGeneratorFeature().setPackageName("gen.cse.ms.ut");
OpenAPI swagger = generator.generate();
String schema = pretty(swagger).trim();
