Skip to content

Commit 6c89db9

Browse files
HugoMarioHugoMario
committed
removed deprecated methods.
1 parent b01f7dc commit 6c89db9

File tree

3 files changed

+0
-299
lines changed

3 files changed

+0
-299
lines changed

‎src/main/java/io/swagger/codegen/v3/generators/SchemaHandler.java

Lines changed: 0 additions & 158 deletions
Original file line numberDiff line numberDiff line change
@@ -153,164 +153,6 @@ private void addInterfaces(List<Schema> schemas, CodegenModel codegenModel, Map<
153153
}
154154
}
155155

156-
/**
157-
* creates a codegen model object based on a composed schema property.
158-
* @param composedProperty
159-
* @param codegenProperty
160-
*/
161-
@Deprecated
162-
protected void createCodegenModel(ComposedSchema composedProperty, CodegenProperty codegenProperty) {
163-
final List<Schema> oneOf = composedProperty.getOneOf();
164-
final List<Schema> anyOf = composedProperty.getAnyOf();
165-
166-
if (oneOf != null && !oneOf.isEmpty()) {
167-
if (!hasNonObjectSchema(oneOf)) {
168-
final CodegenModel oneOfModel = createFromOneOfSchemas(oneOf);
169-
codegenProperty.vendorExtensions.put("oneOf-model", oneOfModel);
170-
}
171-
}
172-
if (anyOf != null && !anyOf.isEmpty()) {
173-
if (!hasNonObjectSchema(anyOf)) {
174-
final CodegenModel anyOfModel = createFromOneOfSchemas(anyOf);
175-
codegenProperty.vendorExtensions.put("anyOf-model", anyOfModel);
176-
}
177-
}
178-
179-
}
180-
181-
@Deprecated
182-
protected void configureComposedModelFromSchemaItems(CodegenModel codegenModel, ComposedSchema items) {
183-
List<Schema> oneOfList = items.getOneOf();
184-
if (oneOfList != null && !oneOfList.isEmpty()){
185-
String name = "OneOf" + codegenModel.name + "Items";
186-
final CodegenModel oneOfModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
187-
this.configureModel(oneOfModel, name);
188-
// setting name to be used as instance type on composed model.
189-
items.addExtension("x-model-name", codegenConfig.toModelName(name));
190-
191-
final List<String> modelNames = new ArrayList<>();
192-
for (Schema interfaceSchema : oneOfList) {
193-
if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
194-
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
195-
modelNames.add(codegenConfig.toModelName(schemaName));
196-
}
197-
}
198-
oneOfModel.vendorExtensions.put("x-model-names", modelNames);
199-
if (!modelNames.isEmpty()) {
200-
codegenModel.vendorExtensions.put("oneOf-model", oneOfModel);
201-
}
202-
}
203-
List<Schema> anyOfList = items.getAnyOf();
204-
if (anyOfList != null && !anyOfList.isEmpty()){
205-
String name = "AnyOf" + codegenModel.name + "Items";
206-
final CodegenModel anyOfModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
207-
this.configureModel(anyOfModel, name);
208-
items.addExtension("x-model-name", codegenConfig.toModelName(name));
209-
210-
final List<String> modelNames = new ArrayList<>();
211-
for (Schema interfaceSchema : anyOfList) {
212-
if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
213-
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
214-
modelNames.add(codegenConfig.toModelName(schemaName));
215-
}
216-
}
217-
anyOfModel.vendorExtensions.put("x-model-names", modelNames);
218-
if (!modelNames.isEmpty()) {
219-
codegenModel.vendorExtensions.put("anyOf-model", anyOfModel);
220-
}
221-
}
222-
}
223-
224-
@Deprecated
225-
public void configureOneOfModel(CodegenModel codegenModel, List<Schema> oneOf) {
226-
final CodegenModel oneOfModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
227-
this.configureModel(oneOfModel, "OneOf" + codegenModel.name);
228-
229-
final List<String> modelNames = new ArrayList<>();
230-
for (Schema interfaceSchema : oneOf) {
231-
if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
232-
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
233-
modelNames.add(codegenConfig.toModelName(schemaName));
234-
}
235-
}
236-
oneOfModel.vendorExtensions.put("x-model-names", modelNames);
237-
if (!modelNames.isEmpty()) {
238-
codegenModel.vendorExtensions.put("oneOf-model", oneOfModel);
239-
if (codegenModel.interfaceModels == null) {
240-
codegenModel.interfaceModels = new ArrayList<>();
241-
}
242-
codegenModel.interfaceModels.add(oneOfModel);
243-
}
244-
}
245-
246-
@Deprecated
247-
public void configureAnyOfModel(CodegenModel codegenModel, List<Schema> anyOf) {
248-
final CodegenModel anyOfModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
249-
this.configureModel(anyOfModel, "AnyOf" + codegenModel.name);
250-
final List<String> modelNames = new ArrayList<>();
251-
for (Schema interfaceSchema : anyOf) {
252-
if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
253-
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
254-
modelNames.add(codegenConfig.toModelName(schemaName));
255-
}
256-
}
257-
anyOfModel.vendorExtensions.put("x-model-names", modelNames);
258-
if (!modelNames.isEmpty()) {
259-
codegenModel.vendorExtensions.put("anyOf-model", anyOfModel);
260-
if (codegenModel.interfaceModels == null) {
261-
codegenModel.interfaceModels = new ArrayList<>();
262-
}
263-
codegenModel.interfaceModels.add(anyOfModel);
264-
}
265-
}
266-
267-
@Deprecated
268-
protected void configureOneOfModelFromProperty(CodegenProperty codegenProperty, CodegenModel codegenModel) {
269-
String name = "OneOf" + codegenConfig.toModelName(codegenModel.name);
270-
name += codegenConfig.toModelName(codegenProperty.name);
271-
CodegenModel oneOfModel = (CodegenModel) codegenProperty.vendorExtensions.get("oneOf-model");
272-
this.configureModel(oneOfModel, name);
273-
codegenProperty.vendorExtensions.remove("oneOf-model");
274-
275-
codegenProperty.datatype = name;
276-
codegenProperty.datatypeWithEnum = name;
277-
codegenProperty.baseType = name;
278-
codegenProperty.complexType = name;
279-
280-
codegenModel.vendorExtensions.put("oneOf-model", oneOfModel);
281-
}
282-
283-
@Deprecated
284-
protected void configureAnyOfModelFromProperty(CodegenProperty codegenProperty, CodegenModel codegenModel) {
285-
String name = "AnyOf" + codegenConfig.toModelName(codegenModel.name);
286-
name += codegenConfig.toModelName(codegenProperty.name);
287-
CodegenModel anyOfModel = (CodegenModel) codegenProperty.vendorExtensions.get("anyOf-model");
288-
this.configureModel(anyOfModel, name);
289-
codegenProperty.vendorExtensions.remove("anyOf-model");
290-
291-
codegenProperty.datatype = name;
292-
codegenProperty.datatypeWithEnum = name;
293-
codegenProperty.baseType = name;
294-
codegenProperty.complexType = name;
295-
296-
codegenModel.vendorExtensions.put("anyOf-model", anyOfModel);
297-
}
298-
299-
@Deprecated
300-
protected CodegenModel createFromOneOfSchemas(List<Schema> schemas) {
301-
final CodegenModel codegenModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
302-
final List<String> modelNames = new ArrayList<>();
303-
304-
for (Schema interfaceSchema : schemas) {
305-
if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
306-
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
307-
modelNames.add(codegenConfig.toModelName(schemaName));
308-
}
309-
}
310-
codegenModel.vendorExtensions.put("x-model-names", modelNames);
311-
return codegenModel;
312-
}
313-
314156
protected void configureModel(CodegenModel codegenModel, String name) {
315157
codegenModel.name = name;
316158
codegenModel.classname = codegenConfig.toModelName(name);

‎src/main/java/io/swagger/codegen/v3/generators/html/HtmlSchemaHandler.java

Lines changed: 0 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -3,142 +3,18 @@
33
import io.swagger.codegen.v3.CodegenModel;
44
import io.swagger.codegen.v3.CodegenModelFactory;
55
import io.swagger.codegen.v3.CodegenModelType;
6-
import io.swagger.codegen.v3.CodegenProperty;
76
import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
87
import io.swagger.codegen.v3.generators.SchemaHandler;
9-
import io.swagger.codegen.v3.generators.util.OpenAPIUtil;
10-
import io.swagger.v3.oas.models.media.ComposedSchema;
11-
import io.swagger.v3.oas.models.media.Schema;
12-
import org.apache.commons.lang3.StringUtils;
13-
14-
import java.util.ArrayList;
15-
import java.util.List;
168

179
public class HtmlSchemaHandler extends SchemaHandler {
1810

1911
public HtmlSchemaHandler(DefaultCodegenConfig codegenConfig) {
2012
super(codegenConfig);
2113
}
2214

23-
24-
@Override
25-
public void createCodegenModel(ComposedSchema composedProperty, CodegenProperty codegenProperty) {
26-
final List<Schema> oneOf = composedProperty.getOneOf();
27-
final List<Schema> anyOf = composedProperty.getAnyOf();
28-
29-
if (oneOf != null && !oneOf.isEmpty()) {
30-
if (!hasNonObjectSchema(oneOf)) {
31-
final CodegenModel oneOfModel = createFromOneOfSchemas(oneOf);
32-
codegenProperty.vendorExtensions.put("oneOf-model", oneOfModel);
33-
}
34-
}
35-
if (anyOf != null && !anyOf.isEmpty()) {
36-
if (!hasNonObjectSchema(anyOf)) {
37-
final CodegenModel anyOfModel = createFromOneOfSchemas(anyOf);
38-
codegenProperty.vendorExtensions.put("anyOf-model", anyOfModel);
39-
}
40-
}
41-
42-
}
43-
44-
@Override
45-
public void configureComposedModelFromSchemaItems(CodegenModel codegenModel, ComposedSchema items) {
46-
List<Schema> oneOfList = items.getOneOf();
47-
if (oneOfList != null && !oneOfList.isEmpty()){
48-
String name = "OneOf" + codegenModel.name + "Items";
49-
final CodegenModel oneOfModel = createComposedModel(name);
50-
// setting name to be used as instance type on composed model.
51-
items.addExtension("x-model-name", codegenConfig.toModelName(name));
52-
53-
final List<String> modelNames = new ArrayList<>();
54-
for (Schema interfaceSchema : oneOfList) {
55-
if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
56-
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
57-
modelNames.add(codegenConfig.toModelName(schemaName));
58-
}
59-
}
60-
oneOfModel.vendorExtensions.put("x-model-names", modelNames);
61-
if (!modelNames.isEmpty()) {
62-
codegenModel.vendorExtensions.put("oneOf-model", oneOfModel);
63-
}
64-
}
65-
List<Schema> anyOfList = items.getAnyOf();
66-
if (anyOfList != null && !anyOfList.isEmpty()){
67-
String name = "AnyOf" + codegenModel.name + "Items";
68-
final CodegenModel anyOfModel = createComposedModel(name);
69-
items.addExtension("x-model-name", codegenConfig.toModelName(name));
70-
71-
final List<String> modelNames = new ArrayList<>();
72-
for (Schema interfaceSchema : anyOfList) {
73-
if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
74-
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
75-
modelNames.add(codegenConfig.toModelName(schemaName));
76-
}
77-
}
78-
anyOfModel.vendorExtensions.put("x-model-names", modelNames);
79-
if (!modelNames.isEmpty()) {
80-
codegenModel.vendorExtensions.put("anyOf-model", anyOfModel);
81-
}
82-
}
83-
}
84-
85-
@Override
86-
public void configureOneOfModel(CodegenModel codegenModel, List<Schema> oneOf) {
87-
// no ops for html generator
88-
}
89-
90-
@Override
91-
public void configureAnyOfModel(CodegenModel codegenModel, List<Schema> anyOf) {
92-
// no ops for html generator
93-
}
94-
95-
@Override
96-
public void configureOneOfModelFromProperty(CodegenProperty codegenProperty, CodegenModel codegenModel) {
97-
// no ops for html generator
98-
}
99-
100-
@Override
101-
public void configureAnyOfModelFromProperty(CodegenProperty codegenProperty, CodegenModel codegenModel) {
102-
// no ops for html generator
103-
}
104-
105-
@Override
106-
protected CodegenModel createFromOneOfSchemas(List<Schema> schemas) {
107-
final CodegenModel codegenModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
108-
final List<String> modelNames = new ArrayList<>();
109-
110-
for (Schema interfaceSchema : schemas) {
111-
if (StringUtils.isNotBlank(interfaceSchema.get$ref())) {
112-
String schemaName = OpenAPIUtil.getSimpleRef(interfaceSchema.get$ref());
113-
modelNames.add(codegenConfig.toModelName(schemaName));
114-
}
115-
}
116-
codegenModel.vendorExtensions.put("x-model-names", modelNames);
117-
return codegenModel;
118-
}
119-
12015
protected CodegenModel createComposedModel(String name) {
12116
final CodegenModel composedModel = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
12217
this.configureModel(composedModel, name);
12318
return composedModel;
12419
}
125-
126-
@Override
127-
protected void configureModel(CodegenModel codegenModel, String name) {
128-
codegenModel.name = name;
129-
codegenModel.classname = codegenConfig.toModelName(name);
130-
codegenModel.classVarName = codegenConfig.toVarName(name);
131-
codegenModel.classFilename = codegenConfig.toModelFilename(name);
132-
codegenModel.vendorExtensions.put("x-is-composed-model", Boolean.TRUE);
133-
}
134-
135-
@Override
136-
protected boolean hasNonObjectSchema(List<Schema> schemas) {
137-
for (Schema schema : schemas) {
138-
if (!codegenConfig.isObjectSchema(schema)) {
139-
return true;
140-
}
141-
}
142-
return false;
143-
}
14420
}

‎src/main/java/io/swagger/codegen/v3/generators/typescript/TypeScriptSchemaHandler.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
package io.swagger.codegen.v3.generators.typescript;
22

3-
import io.swagger.codegen.v3.CodegenConstants;
4-
import io.swagger.codegen.v3.CodegenModel;
53
import io.swagger.codegen.v3.generators.DefaultCodegenConfig;
64
import io.swagger.codegen.v3.generators.SchemaHandler;
7-
import io.swagger.v3.oas.models.media.Schema;
8-
9-
import java.util.List;
105

116
public class TypeScriptSchemaHandler extends SchemaHandler {
127

@@ -16,16 +11,4 @@ public TypeScriptSchemaHandler(DefaultCodegenConfig codegenConfig) {
1611
super(codegenConfig);
1712
this.codegenConfig = (AbstractTypeScriptClientCodegen) codegenConfig;
1813
}
19-
20-
@Override
21-
public void configureOneOfModel(CodegenModel codegenModel, List<Schema> oneOf) {
22-
codegenModel.getVendorExtensions().put(CodegenConstants.IS_ALIAS_EXT_NAME, Boolean.TRUE);
23-
this.codegenConfig.addImport(codegenModel, codegenModel.dataType);
24-
}
25-
26-
@Override
27-
public void configureAnyOfModel(CodegenModel codegenModel, List<Schema> anyOf) {
28-
codegenModel.getVendorExtensions().put(CodegenConstants.IS_ALIAS_EXT_NAME, Boolean.TRUE);
29-
this.codegenConfig.addImport(codegenModel, codegenModel.dataType);
30-
}
3114
}

0 commit comments

Comments
 (0)