You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2019/06/28 00:25:13 UTC
[servicecomb-java-chassis] branch weak-contract-type updated:
[SCB-1327][WIP][WEAK] delete duplicated swagger definition: ExtendConst
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch weak-contract-type
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/weak-contract-type by this push:
new b4de0f0 [SCB-1327][WIP][WEAK] delete duplicated swagger definition: ExtendConst
b4de0f0 is described below
commit b4de0f0d9e0fd9b1a91f4bc04ecb05f9bafd0282
Author: wujimin <wu...@huawei.com>
AuthorDate: Thu Jun 27 22:43:25 2019 +0800
[SCB-1327][WIP][WEAK] delete duplicated swagger definition: ExtendConst
---
.../servicecomb/swagger/extend/ExtendConst.java | 28 ----------------------
.../swagger/extend/ModelResolverExt.java | 3 ++-
.../generator/pojo/PojoOperationGenerator.java | 4 ++--
3 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ExtendConst.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ExtendConst.java
deleted file mode 100644
index a555bca..0000000
--- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ExtendConst.java
+++ /dev/null
@@ -1,28 +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.extend;
-
-public final class ExtendConst {
- private ExtendConst() {
-
- }
-
- public static final String EXT_JAVA_INTF = "x-java-interface";
-
- public static final String EXT_JAVA_CLASS = "x-java-class";
-}
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 99e0716..95bc749 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
@@ -37,6 +37,7 @@ 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.extend.property.creator.ShortPropertyCreator;
+import org.apache.servicecomb.swagger.generator.SwaggerConst;
import org.apache.servicecomb.swagger.generator.SwaggerGeneratorFeature;
import com.fasterxml.jackson.databind.JavaType;
@@ -87,7 +88,7 @@ public class ModelResolverExt extends ModelResolver {
@VisibleForTesting
protected void setType(JavaType type, Map<String, Object> vendorExtensions) {
if (SwaggerGeneratorFeature.isLocalExtJavaClassInVendor()) {
- vendorExtensions.put(ExtendConst.EXT_JAVA_CLASS, type.toCanonical());
+ vendorExtensions.put(SwaggerConst.EXT_JAVA_CLASS, type.toCanonical());
}
}
diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoOperationGenerator.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoOperationGenerator.java
index 04d83e7..9ed8568 100644
--- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoOperationGenerator.java
+++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoOperationGenerator.java
@@ -29,8 +29,8 @@ import javax.ws.rs.HttpMethod;
import org.apache.commons.lang3.StringUtils;
import org.apache.servicecomb.swagger.SwaggerUtils;
-import org.apache.servicecomb.swagger.extend.ExtendConst;
import org.apache.servicecomb.swagger.generator.ParameterGenerator;
+import org.apache.servicecomb.swagger.generator.SwaggerConst;
import org.apache.servicecomb.swagger.generator.SwaggerGeneratorFeature;
import org.apache.servicecomb.swagger.generator.core.AbstractOperationGenerator;
import org.apache.servicecomb.swagger.generator.core.AbstractSwaggerGenerator;
@@ -95,7 +95,7 @@ public class PojoOperationGenerator extends AbstractOperationGenerator {
if (feature.isExtJavaClassInVendor()
&& bodyFields.size() > 1
&& StringUtils.isNotEmpty(feature.getPackageName())) {
- bodyModel.getVendorExtensions().put(ExtendConst.EXT_JAVA_CLASS, feature.getPackageName() + "." + simpleRef);
+ bodyModel.getVendorExtensions().put(SwaggerConst.EXT_JAVA_CLASS, feature.getPackageName() + "." + simpleRef);
}
RefModel refModel = new RefModel();