Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

Commit d2de032

Browse files
committed
Further updates to fromParameter call sites
1 parent e2bd99b commit d2de032

File tree

3 files changed

+9
-630
lines changed

3 files changed

+9
-630
lines changed

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
*/
2727
public class CodegenParameter {
2828
public boolean isFormParam, isQueryParam, isPathParam, isHeaderParam,
29-
isCookieParam, isBodyParam, isContainer,
30-
isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, isDeepObject, isAllowEmptyValue;
31-
public String baseName, paramName, dataType, datatypeWithEnum, dataFormat, contentType,
32-
collectionFormat, description, unescapedDescription, baseType, style;
29+
isCookieParam, isBodyParam,
30+
isExplode, isDeepObject, isAllowEmptyValue;
31+
public String baseName, paramName,
32+
description, unescapedDescription, style;
3333

3434
public String nameInLowerCase; // property name in lower case
3535
public String example; // example value (x-example)
@@ -51,14 +51,8 @@ public CodegenParameter copy() {
5151
CodegenParameter output = new CodegenParameter();
5252
output.baseName = this.baseName;
5353
output.paramName = this.paramName;
54-
output.dataType = this.dataType;
55-
output.datatypeWithEnum = this.datatypeWithEnum;
56-
output.dataFormat = this.dataFormat;
57-
output.collectionFormat = this.collectionFormat;
58-
output.isCollectionFormatMulti = this.isCollectionFormatMulti;
5954
output.description = this.description;
6055
output.unescapedDescription = this.unescapedDescription;
61-
output.baseType = this.baseType;
6256
output.isFormParam = this.isFormParam;
6357
output.isQueryParam = this.isQueryParam;
6458
output.isPathParam = this.isPathParam;
@@ -86,14 +80,13 @@ public CodegenParameter copy() {
8680
output.style = this.style;
8781
output.isDeepObject = this.isDeepObject;
8882
output.isAllowEmptyValue = this.isAllowEmptyValue;
89-
output.contentType = this.contentType;
9083

9184
return output;
9285
}
9386

9487
@Override
9588
public int hashCode() {
96-
return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, style, isDeepObject, isAllowEmptyValue, example, jsonSchema, vendorExtensions, isDeprecated, required, contentType, hasMultipleTypes, schema, content, ref);
89+
return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isExplode, baseName, paramName, description, unescapedDescription, style, isDeepObject, isAllowEmptyValue, example, jsonSchema, vendorExtensions, isDeprecated, required, hasMultipleTypes, schema, content, ref);
9790
}
9891

9992
@Override
@@ -107,10 +100,6 @@ public boolean equals(Object o) {
107100
isHeaderParam == that.isHeaderParam &&
108101
isCookieParam == that.isCookieParam &&
109102
isBodyParam == that.isBodyParam &&
110-
isContainer == that.isContainer &&
111-
isCollectionFormatMulti == that.isCollectionFormatMulti &&
112-
isPrimitiveType == that.isPrimitiveType &&
113-
isModel == that.isModel &&
114103
isExplode == that.isExplode &&
115104
isDeprecated == that.isDeprecated &&
116105
required == that.required &&
@@ -119,20 +108,14 @@ public boolean equals(Object o) {
119108
Objects.equals(schema, that.getSchema()) &&
120109
Objects.equals(baseName, that.baseName) &&
121110
Objects.equals(paramName, that.paramName) &&
122-
Objects.equals(dataType, that.dataType) &&
123-
Objects.equals(datatypeWithEnum, that.datatypeWithEnum) &&
124-
Objects.equals(dataFormat, that.dataFormat) &&
125-
Objects.equals(collectionFormat, that.collectionFormat) &&
126111
Objects.equals(description, that.description) &&
127112
Objects.equals(unescapedDescription, that.unescapedDescription) &&
128-
Objects.equals(baseType, that.baseType) &&
129113
Objects.equals(style, that.style) &&
130114
Objects.equals(isDeepObject, that.isDeepObject) &&
131115
Objects.equals(isAllowEmptyValue, that.isAllowEmptyValue) &&
132116
Objects.equals(example, that.example) &&
133117
Objects.equals(jsonSchema, that.jsonSchema) &&
134-
Objects.equals(vendorExtensions, that.vendorExtensions) &&
135-
Objects.equals(contentType, that.contentType);
118+
Objects.equals(vendorExtensions, that.vendorExtensions);
136119
}
137120

138121
@Override
@@ -144,20 +127,11 @@ public String toString() {
144127
sb.append(", isHeaderParam=").append(isHeaderParam);
145128
sb.append(", isCookieParam=").append(isCookieParam);
146129
sb.append(", isBodyParam=").append(isBodyParam);
147-
sb.append(", isContainer=").append(isContainer);
148-
sb.append(", isCollectionFormatMulti=").append(isCollectionFormatMulti);
149-
sb.append(", isPrimitiveType=").append(isPrimitiveType);
150-
sb.append(", isModel=").append(isModel);
151130
sb.append(", isExplode=").append(isExplode);
152131
sb.append(", baseName='").append(baseName).append('\'');
153132
sb.append(", paramName='").append(paramName).append('\'');
154-
sb.append(", dataType='").append(dataType).append('\'');
155-
sb.append(", datatypeWithEnum='").append(datatypeWithEnum).append('\'');
156-
sb.append(", dataFormat='").append(dataFormat).append('\'');
157-
sb.append(", collectionFormat='").append(collectionFormat).append('\'');
158133
sb.append(", description='").append(description).append('\'');
159134
sb.append(", unescapedDescription='").append(unescapedDescription).append('\'');
160-
sb.append(", baseType='").append(baseType).append('\'');
161135
sb.append(", style='").append(style).append('\'');
162136
sb.append(", deepObject='").append(isDeepObject).append('\'');
163137
sb.append(", allowEmptyValue='").append(isAllowEmptyValue).append('\'');
@@ -166,7 +140,6 @@ public String toString() {
166140
sb.append(", vendorExtensions=").append(vendorExtensions);
167141
sb.append(", isDeprecated=").append(isDeprecated);
168142
sb.append(", required=").append(required);
169-
sb.append(", contentType=").append(contentType);
170143
sb.append(", hasMultipleTypes=").append(hasMultipleTypes);
171144
sb.append(", schema=").append(schema);
172145
sb.append(", content=").append(content);

0 commit comments

Comments
 (0)