Skip to content

Commit b9afd6e

Browse files
winridwinrid
committed
use Arrays.asList
1 parent 0d58d92 commit b9afd6e

File tree

233 files changed

+318
-1256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

233 files changed

+318
-1256
lines changed

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -322,16 +322,20 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
322322

323323
static {
324324
// a set of all properties/fields (JSON key names)
325-
openapiFields = new HashSet<String>({{#allVars}}1{{^-last}} + {{/-last}}{{/allVars}}{{^allVars}}0{{/allVars}});
326-
{{#allVars}}
327-
openapiFields.add("{{baseName}}");
328-
{{/allVars}}
325+
{{#hasVars}}
326+
openapiFields = new HashSet<String>(Arrays.asList({{#allVars}}"{{baseName}}"{{^-last}}, {{/-last}}{{/allVars}}));
327+
{{/hasVars}}
328+
{{^hasVars}}
329+
openapiFields = new HashSet<String>(0);
330+
{{/hasVars}}
329331

330332
// a set of required properties/fields (JSON key names)
331-
openapiRequiredFields = new HashSet<String>({{#requiredVars}}1{{^-last}} + {{/-last}}{{/requiredVars}}{{^requiredVars}}0{{/requiredVars}});
332-
{{#requiredVars}}
333-
openapiRequiredFields.add("{{baseName}}");
334-
{{/requiredVars}}
333+
{{#hasRequired}}
334+
openapiRequiredFields = new HashSet<String>(Arrays.asList({{#requiredVars}}"{{baseName}}"{{^-last}}, {{/-last}}{{/requiredVars}}));
335+
{{/hasRequired}}
336+
{{^hasRequired}}
337+
openapiRequiredFields = new HashSet<String>(0);
338+
{{/hasRequired}}
335339
}
336340

337341
/**

‎samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Category.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@ private String toIndentedString(Object o) {
147147

148148
static {
149149
// a set of all properties/fields (JSON key names)
150-
openapiFields = new HashSet<String>(1 + 1);
151-
openapiFields.add("id");
152-
openapiFields.add("name");
150+
openapiFields = new HashSet<String>(Arrays.asList("id", "name"));
153151

154152
// a set of required properties/fields (JSON key names)
155153
openapiRequiredFields = new HashSet<String>(0);

‎samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/ModelApiResponse.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,7 @@ private String toIndentedString(Object o) {
173173

174174
static {
175175
// a set of all properties/fields (JSON key names)
176-
openapiFields = new HashSet<String>(1 + 1 + 1);
177-
openapiFields.add("code");
178-
openapiFields.add("type");
179-
openapiFields.add("message");
176+
openapiFields = new HashSet<String>(Arrays.asList("code", "type", "message"));
180177

181178
// a set of required properties/fields (JSON key names)
182179
openapiRequiredFields = new HashSet<String>(0);

‎samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -306,13 +306,7 @@ private String toIndentedString(Object o) {
306306

307307
static {
308308
// a set of all properties/fields (JSON key names)
309-
openapiFields = new HashSet<String>(1 + 1 + 1 + 1 + 1 + 1);
310-
openapiFields.add("id");
311-
openapiFields.add("petId");
312-
openapiFields.add("quantity");
313-
openapiFields.add("shipDate");
314-
openapiFields.add("status");
315-
openapiFields.add("complete");
309+
openapiFields = new HashSet<String>(Arrays.asList("id", "petId", "quantity", "shipDate", "status", "complete"));
316310

317311
// a set of required properties/fields (JSON key names)
318312
openapiRequiredFields = new HashSet<String>(0);

‎samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -330,18 +330,10 @@ private String toIndentedString(Object o) {
330330

331331
static {
332332
// a set of all properties/fields (JSON key names)
333-
openapiFields = new HashSet<String>(1 + 1 + 1 + 1 + 1 + 1);
334-
openapiFields.add("id");
335-
openapiFields.add("category");
336-
openapiFields.add("name");
337-
openapiFields.add("photoUrls");
338-
openapiFields.add("tags");
339-
openapiFields.add("status");
333+
openapiFields = new HashSet<String>(Arrays.asList("id", "category", "name", "photoUrls", "tags", "status"));
340334

341335
// a set of required properties/fields (JSON key names)
342-
openapiRequiredFields = new HashSet<String>(1 + 1);
343-
openapiRequiredFields.add("name");
344-
openapiRequiredFields.add("photoUrls");
336+
openapiRequiredFields = new HashSet<String>(Arrays.asList("name", "photoUrls"));
345337
}
346338

347339
/**

‎samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Tag.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@ private String toIndentedString(Object o) {
147147

148148
static {
149149
// a set of all properties/fields (JSON key names)
150-
openapiFields = new HashSet<String>(1 + 1);
151-
openapiFields.add("id");
152-
openapiFields.add("name");
150+
openapiFields = new HashSet<String>(Arrays.asList("id", "name"));
153151

154152
// a set of required properties/fields (JSON key names)
155153
openapiRequiredFields = new HashSet<String>(0);

‎samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/User.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -303,15 +303,7 @@ private String toIndentedString(Object o) {
303303

304304
static {
305305
// a set of all properties/fields (JSON key names)
306-
openapiFields = new HashSet<String>(1 + 1 + 1 + 1 + 1 + 1 + 1 + 1);
307-
openapiFields.add("id");
308-
openapiFields.add("username");
309-
openapiFields.add("firstName");
310-
openapiFields.add("lastName");
311-
openapiFields.add("email");
312-
openapiFields.add("password");
313-
openapiFields.add("phone");
314-
openapiFields.add("userStatus");
306+
openapiFields = new HashSet<String>(Arrays.asList("id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus"));
315307

316308
// a set of required properties/fields (JSON key names)
317309
openapiRequiredFields = new HashSet<String>(0);

‎samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Bird.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@ private String toIndentedString(Object o) {
147147

148148
static {
149149
// a set of all properties/fields (JSON key names)
150-
openapiFields = new HashSet<String>(1 + 1);
151-
openapiFields.add("size");
152-
openapiFields.add("color");
150+
openapiFields = new HashSet<String>(Arrays.asList("size", "color"));
153151

154152
// a set of required properties/fields (JSON key names)
155153
openapiRequiredFields = new HashSet<String>(0);

‎samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@ private String toIndentedString(Object o) {
147147

148148
static {
149149
// a set of all properties/fields (JSON key names)
150-
openapiFields = new HashSet<String>(1 + 1);
151-
openapiFields.add("id");
152-
openapiFields.add("name");
150+
openapiFields = new HashSet<String>(Arrays.asList("id", "name"));
153151

154152
// a set of required properties/fields (JSON key names)
155153
openapiRequiredFields = new HashSet<String>(0);

‎samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,7 @@ private String toIndentedString(Object o) {
179179

180180
static {
181181
// a set of all properties/fields (JSON key names)
182-
openapiFields = new HashSet<String>(1 + 1 + 1 + 1 + 1);
183-
openapiFields.add("id");
184-
openapiFields.add("outcomes");
185-
openapiFields.add("suffix");
186-
openapiFields.add("text");
187-
openapiFields.add("date");
182+
openapiFields = new HashSet<String>(Arrays.asList("id", "outcomes", "suffix", "text", "date"));
188183

189184
// a set of required properties/fields (JSON key names)
190185
openapiRequiredFields = new HashSet<String>(0);

0 commit comments

Comments
 (0)