loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Java][bugfix] hashcode/equals behave incorrectly when inheritance is used in Generated Pojos (#15745)

Browse Source 
* Fix Java equals and hashCode methods to work with inheritence (#5756)

* Regenerate code samples with improved hashCode/equals

---------

Co-authored-by: Andrew Pikler <andrew.pikler@earnix.com>
This commit is contained in:
pyckle 2023-06-21 03:33:01 -05:00 committed by GitHub
parent 7e89e1ea81
commit 33aa5b07f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
266 changed files with 1050 additions and 1017 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openapi-generator/src/main/resources/JavaInflector/pojo.mustache vendored
View File

@ -59,14 +59,13 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
return false; return false;
} }
{{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}} {{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}}
return {{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} && return {{#parent}}super.equals(o) && {{/parent}}{{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} &&
{{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}} {{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}}{{#parent}}return super.equals(o);{{/parent}}{{^parent}}return true;{{/parent}}{{/hasVars}}
return true;{{/hasVars}}
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash({{#vars}}{{name}}{{^-last}}, {{/-last}}{{/vars}}); return {{^hasVars}}{{#parent}}super.hashCode(){{/parent}}{{^parent}}1{{/parent}}{{/hasVars}}{{#hasVars}}Objects.hash({{#vars}}{{#parent}}super.hashCode(), {{/parent}}{{name}}{{^-last}}, {{/-last}}{{/vars}}){{/hasVars}};
} }
@Override @Override

8
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache vendored
View File

@ -81,15 +81,13 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
return false; return false;
} }
{{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}} {{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}}
return {{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} && return {{#parent}}super.equals(o) && {{/parent}}{{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} &&
{{/-last}}{{/vars}}{{#parent}} && {{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}}{{#parent}}return super.equals(o);{{/parent}}{{^parent}}return true;{{/parent}}{{/hasVars}}
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
return true;{{/hasVars}}
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash({{#vars}}{{name}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}); return {{^hasVars}}{{#parent}}super.hashCode(){{/parent}}{{^parent}}1{{/parent}}{{/hasVars}}{{#hasVars}}Objects.hash({{#vars}}{{#parent}}super.hashCode(), {{/parent}}{{name}}{{^-last}}, {{/-last}}{{/vars}}){{/hasVars}};
} }
@Override @Override

18
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pojo.mustache vendored
View File

@ -133,6 +133,24 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi
{{/vars}} {{/vars}}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
{{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}}
return {{#parent}}super.equals(o) && {{/parent}}{{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} &&
{{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}}{{#parent}}return super.equals(o);{{/parent}}{{^parent}}return true;{{/parent}}{{/hasVars}}
}
@Override
public int hashCode() {
return {{^hasVars}}{{#parent}}super.hashCode(){{/parent}}{{^parent}}1{{/parent}}{{/hasVars}}{{#hasVars}}Objects.hash({{#vars}}{{#parent}}super.hashCode(), {{/parent}}{{name}}{{^-last}}, {{/-last}}{{/vars}}){{/hasVars}};
}
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();

12
modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache vendored
View File

@ -106,17 +106,15 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
} }
if (o == null || getClass() != o.getClass()) { if (o == null || getClass() != o.getClass()) {
return false; return false;
}{{#hasVars}} }
{{classname}} {{classVarName}} = ({{classname}}) o; {{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}}
return {{#vars}}Objects.equals(this.{{name}}, {{classVarName}}.{{name}}){{^-last}} && return {{#parent}}super.equals(o) && {{/parent}}{{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} &&
{{/-last}}{{/vars}}{{#parent}} && {{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}}{{#parent}}return super.equals(o);{{/parent}}{{^parent}}return true;{{/parent}}{{/hasVars}}
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
return true;{{/hasVars}}
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash({{#vars}}{{name}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}}); return {{^hasVars}}{{#parent}}super.hashCode(){{/parent}}{{^parent}}1{{/parent}}{{/hasVars}}{{#hasVars}}Objects.hash({{#vars}}{{#parent}}super.hashCode(), {{/parent}}{{name}}{{^-last}}, {{/-last}}{{/vars}}){{/hasVars}};
} }
@Override @Override

7
modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/pojo.mustache vendored
View File

@ -52,14 +52,13 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
return false; return false;
} }
{{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}} {{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}}
return {{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} && return {{#parent}}super.equals(o) && {{/parent}}{{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} &&
{{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}} {{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}}{{#parent}}return super.equals(o);{{/parent}}{{^parent}}return true;{{/parent}}{{/hasVars}}
return true;{{/hasVars}}
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash({{#vars}}{{name}}{{^-last}}, {{/-last}}{{/vars}}); return {{^hasVars}}{{#parent}}super.hashCode(){{/parent}}{{^parent}}1{{/parent}}{{/hasVars}}{{#hasVars}}Objects.hash({{#vars}}{{#parent}}super.hashCode(), {{/parent}}{{name}}{{^-last}}, {{/-last}}{{/vars}}){{/hasVars}};
} }
@Override @Override

7
modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pojo.mustache vendored
View File

@ -54,14 +54,13 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
return false; return false;
} }
{{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}} {{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}}
return {{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} && return {{#parent}}super.equals(o) && {{/parent}}{{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} &&
{{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}} {{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}}{{#parent}}return super.equals(o);{{/parent}}{{^parent}}return true;{{/parent}}{{/hasVars}}
return true;{{/hasVars}}
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash({{#vars}}{{name}}{{^-last}}, {{/-last}}{{/vars}}); return {{^hasVars}}{{#parent}}super.hashCode(){{/parent}}{{^parent}}1{{/parent}}{{/hasVars}}{{#hasVars}}Objects.hash({{#vars}}{{#parent}}super.hashCode(), {{/parent}}{{name}}{{^-last}}, {{/-last}}{{/vars}}){{/hasVars}};
} }
@Override @Override

7
modules/openapi-generator/src/main/resources/JavaVertXServer/pojo.mustache vendored
View File

@ -39,14 +39,13 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
return false; return false;
} }
{{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}} {{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}}
return {{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} && return {{#parent}}super.equals(o) && {{/parent}}{{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} &&
{{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}} {{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}}{{#parent}}return super.equals(o);{{/parent}}{{^parent}}return true;{{/parent}}{{/hasVars}}
return true;{{/hasVars}}
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash({{#vars}}{{name}}{{^-last}}, {{/-last}}{{/vars}}); return {{^hasVars}}{{#parent}}super.hashCode(){{/parent}}{{^parent}}1{{/parent}}{{/hasVars}}{{#hasVars}}Objects.hash({{#vars}}{{#parent}}super.hashCode(), {{/parent}}{{name}}{{^-last}}, {{/-last}}{{/vars}}){{/hasVars}};
} }
@Override @Override

7
modules/openapi-generator/src/main/resources/JavaVertXWebServer/pojo.mustache vendored
View File

@ -39,14 +39,13 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
return false; return false;
} }
{{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}} {{classname}} {{classVarName}} = ({{classname}}) o;{{#hasVars}}
return {{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} && return {{#parent}}super.equals(o) && {{/parent}}{{#vars}}Objects.equals({{name}}, {{classVarName}}.{{name}}){{^-last}} &&
{{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}} {{/-last}}{{#-last}};{{/-last}}{{/vars}}{{/hasVars}}{{^hasVars}}{{#parent}}return super.equals(o);{{/parent}}{{^parent}}return true;{{/parent}}{{/hasVars}}
return true;{{/hasVars}}
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash({{#vars}}{{name}}{{^-last}}, {{/-last}}{{/vars}}); return {{^hasVars}}{{#parent}}super.hashCode(){{/parent}}{{^parent}}1{{/parent}}{{/hasVars}}{{#hasVars}}Objects.hash({{#vars}}{{#parent}}super.hashCode(), {{/parent}}{{name}}{{^-last}}, {{/-last}}{{/vars}}){{/hasVars}};
} }
@Override @Override

34
modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJaxrsBaseTest.java
View File

@ -10,6 +10,7 @@ import org.openapitools.codegen.CodegenConstants;
import org.openapitools.codegen.DefaultGenerator; import org.openapitools.codegen.DefaultGenerator;
import org.openapitools.codegen.MockDefaultGenerator; import org.openapitools.codegen.MockDefaultGenerator;
import org.openapitools.codegen.TestUtils; import org.openapitools.codegen.TestUtils;
import org.openapitools.codegen.java.assertions.JavaFileAssert;
import org.openapitools.codegen.languages.AbstractJavaJAXRSServerCodegen; import org.openapitools.codegen.languages.AbstractJavaJAXRSServerCodegen;
import org.openapitools.codegen.languages.features.CXFServerFeatures; import org.openapitools.codegen.languages.features.CXFServerFeatures;
import org.testng.Assert; import org.testng.Assert;
@ -21,6 +22,8 @@ import java.nio.file.Files;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.function.Function;
import java.util.stream.Collectors;
import static org.openapitools.codegen.TestUtils.assertFileContains; import static org.openapitools.codegen.TestUtils.assertFileContains;
import static org.openapitools.codegen.TestUtils.assertFileNotContains; import static org.openapitools.codegen.TestUtils.assertFileNotContains;
@ -300,4 +303,35 @@ public abstract class JavaJaxrsBaseTest {
TestUtils.assertExtraAnnotationFiles(outputPath + "/src/gen/java/org/openapitools/model"); TestUtils.assertExtraAnnotationFiles(outputPath + "/src/gen/java/org/openapitools/model");
} }
@Test(description = "Validate that the generated equals()/hashCode() methods call super.equals() and super.hasCode()")
public void testClassInheritanceEqualsHashCode() throws Exception {
File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
output.deleteOnExit();
codegen.setOutputDir(output.getAbsolutePath());
OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/allOf_no_fields.yaml");
ClientOptInput input = new ClientOptInput()
.openAPI(openAPI)
.config(codegen);
DefaultGenerator generator = new DefaultGenerator();
Map<String, File> files = generator.opts(input)
.generate().stream()
.collect(Collectors.toMap(File::getName, Function.identity()));
// Assert that the base class does not call super.equals() or super.hashCode()
JavaFileAssert.assertThat(files.get("BaseClass.java")).assertMethod("equals").bodyNotContainsLines("super");
JavaFileAssert.assertThat(files.get("BaseClass.java")).assertMethod("hashCode").bodyNotContainsLines("super");
// Assert that the child class does call the super.equals and super.hashCode method
assertCallsSuperInEqualsAndHashcode(files.get("ChildWithProperties.java"));
assertCallsSuperInEqualsAndHashcode(files.get("ChildWithoutProperties.java"));
}
private static void assertCallsSuperInEqualsAndHashcode(File toCheck) {
JavaFileAssert.assertThat(toCheck).assertMethod("equals").bodyContainsLines("super.equals");
JavaFileAssert.assertThat(toCheck).assertMethod("hashCode").bodyContainsLines("super.hashCode");
}
} }

43
modules/openapi-generator/src/test/resources/3_0/allOf_no_fields.yaml Normal file
View File

@ -0,0 +1,43 @@
openapi: 3.0.1
info:
version: 1.0.0
title: Example
license:
name: MIT
servers:
- url: http://api.example.xyz/v1
paths:
/example:
get:
operationId: dummyid
responses:
'200':
description: OK
content:
application/json:
schema:
$ref: "#/components/schemas/BaseClass"
components:
schemas:
BaseClass:
type: object
properties:
myDiscrim:
type: string
discriminator:
propertyName: myDiscrim
mapping:
WITHPROPS: '#/components/schemas/ChildWithProperties'
WITHOUTPROPS: '#/components/schemas/ChildWithoutProperties'
ChildWithoutProperties:
type: object
allOf:
- $ref: '#/components/schemas/BaseClass'
ChildWithProperties:
type: object
allOf:
- type: object
properties:
childProperty:
type: string
- $ref: '#/components/schemas/BaseClass'

5
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
View File

@ -67,13 +67,12 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> impleme
return false; return false;
} }
AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
return Objects.equals(this.name, additionalPropertiesAnyType.name) && return super.equals(o) && Objects.equals(name, additionalPropertiesAnyType.name);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(name, super.hashCode()); return Objects.hash(super.hashCode(), name);
} }
@Override @Override

5
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
View File

@ -68,13 +68,12 @@ public class AdditionalPropertiesArray extends HashMap<String, List> implements
return false; return false;
} }
AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
return Objects.equals(this.name, additionalPropertiesArray.name) && return super.equals(o) && Objects.equals(name, additionalPropertiesArray.name);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(name, super.hashCode()); return Objects.hash(super.hashCode(), name);
} }
@Override @Override

5
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
View File

@ -67,13 +67,12 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implem
return false; return false;
} }
AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
return Objects.equals(this.name, additionalPropertiesBoolean.name) && return super.equals(o) && Objects.equals(name, additionalPropertiesBoolean.name);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(name, super.hashCode()); return Objects.hash(super.hashCode(), name);
} }
@Override @Override

22
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
View File

@ -383,17 +383,17 @@ public class AdditionalPropertiesClass implements Serializable {
return false; return false;
} }
AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o; AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
return Objects.equals(this.mapString, additionalPropertiesClass.mapString) && return Objects.equals(mapString, additionalPropertiesClass.mapString) &&
Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) && Objects.equals(mapNumber, additionalPropertiesClass.mapNumber) &&
Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) && Objects.equals(mapInteger, additionalPropertiesClass.mapInteger) &&
Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) && Objects.equals(mapBoolean, additionalPropertiesClass.mapBoolean) &&
Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) && Objects.equals(mapArrayInteger, additionalPropertiesClass.mapArrayInteger) &&
Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) && Objects.equals(mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) &&
Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(mapMapString, additionalPropertiesClass.mapMapString) &&
Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(mapMapAnytype, additionalPropertiesClass.mapMapAnytype) &&
Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && Objects.equals(anytype1, additionalPropertiesClass.anytype1) &&
Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(anytype2, additionalPropertiesClass.anytype2) &&
Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); Objects.equals(anytype3, additionalPropertiesClass.anytype3);
} }
@Override @Override

5
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
View File

@ -67,13 +67,12 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> implem
return false; return false;
} }
AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
return Objects.equals(this.name, additionalPropertiesInteger.name) && return super.equals(o) && Objects.equals(name, additionalPropertiesInteger.name);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(name, super.hashCode()); return Objects.hash(super.hashCode(), name);
} }
@Override @Override

5
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
View File

@ -68,13 +68,12 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> impl
return false; return false;
} }
AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
return Objects.equals(this.name, additionalPropertiesNumber.name) && return super.equals(o) && Objects.equals(name, additionalPropertiesNumber.name);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(name, super.hashCode()); return Objects.hash(super.hashCode(), name);
} }
@Override @Override

5
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesObject.java
View File

@ -67,13 +67,12 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> implements
return false; return false;
} }
AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o; AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
return Objects.equals(this.name, additionalPropertiesObject.name) && return super.equals(o) && Objects.equals(name, additionalPropertiesObject.name);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(name, super.hashCode()); return Objects.hash(super.hashCode(), name);
} }
@Override @Override

5
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/AdditionalPropertiesString.java
View File

@ -67,13 +67,12 @@ public class AdditionalPropertiesString extends HashMap<String, String> implemen
return false; return false;
} }
AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o; AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
return Objects.equals(this.name, additionalPropertiesString.name) && return super.equals(o) && Objects.equals(name, additionalPropertiesString.name);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(name, super.hashCode()); return Objects.hash(super.hashCode(), name);
} }
@Override @Override

4
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Animal.java
View File

@ -99,8 +99,8 @@ public class Animal implements Serializable {
return false; return false;
} }
Animal animal = (Animal) o; Animal animal = (Animal) o;
return Objects.equals(this.className, animal.className) && return Objects.equals(className, animal.className) &&
Objects.equals(this.color, animal.color); Objects.equals(color, animal.color);
} }
@Override @Override

2
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
View File

@ -76,7 +76,7 @@ public class ArrayOfArrayOfNumberOnly implements Serializable {
return false; return false;
} }
ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o; ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o;
return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber); return Objects.equals(arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber);
} }
@Override @Override

2
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
View File

@ -76,7 +76,7 @@ public class ArrayOfNumberOnly implements Serializable {
return false; return false;
} }
ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o; ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o;
return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber); return Objects.equals(arrayNumber, arrayOfNumberOnly.arrayNumber);
} }
@Override @Override

6
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ArrayTest.java
View File

@ -142,9 +142,9 @@ public class ArrayTest implements Serializable {
return false; return false;
} }
ArrayTest arrayTest = (ArrayTest) o; ArrayTest arrayTest = (ArrayTest) o;
return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) && return Objects.equals(arrayOfString, arrayTest.arrayOfString) &&
Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) && Objects.equals(arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel); Objects.equals(arrayArrayOfModel, arrayTest.arrayArrayOfModel);
} }
@Override @Override

5
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/BigCat.java
View File

@ -102,13 +102,12 @@ public class BigCat extends Cat implements Serializable {
return false; return false;
} }
BigCat bigCat = (BigCat) o; BigCat bigCat = (BigCat) o;
return Objects.equals(this.kind, bigCat.kind) && return super.equals(o) && Objects.equals(kind, bigCat.kind);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(kind, super.hashCode()); return Objects.hash(super.hashCode(), kind);
} }
@Override @Override

12
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Capitalization.java
View File

@ -190,12 +190,12 @@ public class Capitalization implements Serializable {
return false; return false;
} }
Capitalization capitalization = (Capitalization) o; Capitalization capitalization = (Capitalization) o;
return Objects.equals(this.smallCamel, capitalization.smallCamel) && return Objects.equals(smallCamel, capitalization.smallCamel) &&
Objects.equals(this.capitalCamel, capitalization.capitalCamel) && Objects.equals(capitalCamel, capitalization.capitalCamel) &&
Objects.equals(this.smallSnake, capitalization.smallSnake) && Objects.equals(smallSnake, capitalization.smallSnake) &&
Objects.equals(this.capitalSnake, capitalization.capitalSnake) && Objects.equals(capitalSnake, capitalization.capitalSnake) &&
Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) && Objects.equals(scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
Objects.equals(this.ATT_NAME, capitalization.ATT_NAME); Objects.equals(ATT_NAME, capitalization.ATT_NAME);
} }
@Override @Override

5
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Cat.java
View File

@ -66,13 +66,12 @@ public class Cat extends Animal implements Serializable {
return false; return false;
} }
Cat cat = (Cat) o; Cat cat = (Cat) o;
return Objects.equals(this.declawed, cat.declawed) && return super.equals(o) && Objects.equals(declawed, cat.declawed);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(declawed, super.hashCode()); return Objects.hash(super.hashCode(), declawed);
} }
@Override @Override

4
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Category.java
View File

@ -90,8 +90,8 @@ public class Category implements Serializable {
return false; return false;
} }
Category category = (Category) o; Category category = (Category) o;
return Objects.equals(this.id, category.id) && return Objects.equals(id, category.id) &&
Objects.equals(this.name, category.name); Objects.equals(name, category.name);
} }
@Override @Override

2
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ClassModel.java
View File

@ -66,7 +66,7 @@ public class ClassModel implements Serializable {
return false; return false;
} }
ClassModel classModel = (ClassModel) o; ClassModel classModel = (ClassModel) o;
return Objects.equals(this.propertyClass, classModel.propertyClass); return Objects.equals(propertyClass, classModel.propertyClass);
} }
@Override @Override

2
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Client.java
View File

@ -65,7 +65,7 @@ public class Client implements Serializable {
return false; return false;
} }
Client client = (Client) o; Client client = (Client) o;
return Objects.equals(this.client, client.client); return Objects.equals(client, client.client);
} }
@Override @Override

5
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Dog.java
View File

@ -66,13 +66,12 @@ public class Dog extends Animal implements Serializable {
return false; return false;
} }
Dog dog = (Dog) o; Dog dog = (Dog) o;
return Objects.equals(this.breed, dog.breed) && return super.equals(o) && Objects.equals(breed, dog.breed);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(breed, super.hashCode()); return Objects.hash(super.hashCode(), breed);
} }
@Override @Override

4
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumArrays.java
View File

@ -163,8 +163,8 @@ public class EnumArrays implements Serializable {
return false; return false;
} }
EnumArrays enumArrays = (EnumArrays) o; EnumArrays enumArrays = (EnumArrays) o;
return Objects.equals(this.justSymbol, enumArrays.justSymbol) && return Objects.equals(justSymbol, enumArrays.justSymbol) &&
Objects.equals(this.arrayEnum, enumArrays.arrayEnum); Objects.equals(arrayEnum, enumArrays.arrayEnum);
} }
@Override @Override

10
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/EnumTest.java
View File

@ -296,11 +296,11 @@ public class EnumTest implements Serializable {
return false; return false;
} }
EnumTest enumTest = (EnumTest) o; EnumTest enumTest = (EnumTest) o;
return Objects.equals(this.enumString, enumTest.enumString) && return Objects.equals(enumString, enumTest.enumString) &&
Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) && Objects.equals(enumStringRequired, enumTest.enumStringRequired) &&
Objects.equals(this.enumInteger, enumTest.enumInteger) && Objects.equals(enumInteger, enumTest.enumInteger) &&
Objects.equals(this.enumNumber, enumTest.enumNumber) && Objects.equals(enumNumber, enumTest.enumNumber) &&
Objects.equals(this.outerEnum, enumTest.outerEnum); Objects.equals(outerEnum, enumTest.outerEnum);
} }
@Override @Override

4
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
View File

@ -101,8 +101,8 @@ public class FileSchemaTestClass implements Serializable {
return false; return false;
} }
FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o; FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
return Objects.equals(this._file, fileSchemaTestClass._file) && return Objects.equals(_file, fileSchemaTestClass._file) &&
Objects.equals(this.files, fileSchemaTestClass.files); Objects.equals(files, fileSchemaTestClass.files);
} }
@Override @Override

28
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java
View File

@ -406,20 +406,20 @@ public class FormatTest implements Serializable {
return false; return false;
} }
FormatTest formatTest = (FormatTest) o; FormatTest formatTest = (FormatTest) o;
return Objects.equals(this.integer, formatTest.integer) && return Objects.equals(integer, formatTest.integer) &&
Objects.equals(this.int32, formatTest.int32) && Objects.equals(int32, formatTest.int32) &&
Objects.equals(this.int64, formatTest.int64) && Objects.equals(int64, formatTest.int64) &&
Objects.equals(this.number, formatTest.number) && Objects.equals(number, formatTest.number) &&
Objects.equals(this._float, formatTest._float) && Objects.equals(_float, formatTest._float) &&
Objects.equals(this._double, formatTest._double) && Objects.equals(_double, formatTest._double) &&
Objects.equals(this.string, formatTest.string) && Objects.equals(string, formatTest.string) &&
Objects.equals(this._byte, formatTest._byte) && Objects.equals(_byte, formatTest._byte) &&
Objects.equals(this.binary, formatTest.binary) && Objects.equals(binary, formatTest.binary) &&
Objects.equals(this.date, formatTest.date) && Objects.equals(date, formatTest.date) &&
Objects.equals(this.dateTime, formatTest.dateTime) && Objects.equals(dateTime, formatTest.dateTime) &&
Objects.equals(this.uuid, formatTest.uuid) && Objects.equals(uuid, formatTest.uuid) &&
Objects.equals(this.password, formatTest.password) && Objects.equals(password, formatTest.password) &&
Objects.equals(this.bigDecimal, formatTest.bigDecimal); Objects.equals(bigDecimal, formatTest.bigDecimal);
} }
@Override @Override

4
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
View File

@ -91,8 +91,8 @@ public class HasOnlyReadOnly implements Serializable {
return false; return false;
} }
HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o; HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o;
return Objects.equals(this.bar, hasOnlyReadOnly.bar) && return Objects.equals(bar, hasOnlyReadOnly.bar) &&
Objects.equals(this.foo, hasOnlyReadOnly.foo); Objects.equals(foo, hasOnlyReadOnly.foo);
} }
@Override @Override

8
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MapTest.java
View File

@ -206,10 +206,10 @@ public class MapTest implements Serializable {
return false; return false;
} }
MapTest mapTest = (MapTest) o; MapTest mapTest = (MapTest) o;
return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) && return Objects.equals(mapMapOfString, mapTest.mapMapOfString) &&
Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) && Objects.equals(mapOfEnumString, mapTest.mapOfEnumString) &&
Objects.equals(this.directMap, mapTest.directMap) && Objects.equals(directMap, mapTest.directMap) &&
Objects.equals(this.indirectMap, mapTest.indirectMap); Objects.equals(indirectMap, mapTest.indirectMap);
} }
@Override @Override

6
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

@ -128,9 +128,9 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl
return false; return false;
} }
MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && return Objects.equals(uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && Objects.equals(dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); Objects.equals(map, mixedPropertiesAndAdditionalPropertiesClass.map);
} }
@Override @Override

4
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Model200Response.java
View File

@ -92,8 +92,8 @@ public class Model200Response implements Serializable {
return false; return false;
} }
Model200Response _200response = (Model200Response) o; Model200Response _200response = (Model200Response) o;
return Objects.equals(this.name, _200response.name) && return Objects.equals(name, _200response.name) &&
Objects.equals(this.propertyClass, _200response.propertyClass); Objects.equals(propertyClass, _200response.propertyClass);
} }
@Override @Override

6
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ModelApiResponse.java
View File

@ -116,9 +116,9 @@ public class ModelApiResponse implements Serializable {
return false; return false;
} }
ModelApiResponse _apiResponse = (ModelApiResponse) o; ModelApiResponse _apiResponse = (ModelApiResponse) o;
return Objects.equals(this.code, _apiResponse.code) && return Objects.equals(code, _apiResponse.code) &&
Objects.equals(this.type, _apiResponse.type) && Objects.equals(type, _apiResponse.type) &&
Objects.equals(this.message, _apiResponse.message); Objects.equals(message, _apiResponse.message);
} }
@Override @Override

2
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ModelFile.java
View File

@ -67,7 +67,7 @@ public class ModelFile implements Serializable {
return false; return false;
} }
ModelFile _file = (ModelFile) o; ModelFile _file = (ModelFile) o;
return Objects.equals(this.sourceURI, _file.sourceURI); return Objects.equals(sourceURI, _file.sourceURI);
} }
@Override @Override

2
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ModelList.java
View File

@ -66,7 +66,7 @@ public class ModelList implements Serializable {
return false; return false;
} }
ModelList _list = (ModelList) o; ModelList _list = (ModelList) o;
return Objects.equals(this._123list, _list._123list); return Objects.equals(_123list, _list._123list);
} }
@Override @Override

2
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ModelReturn.java
View File

@ -67,7 +67,7 @@ public class ModelReturn implements Serializable {
return false; return false;
} }
ModelReturn _return = (ModelReturn) o; ModelReturn _return = (ModelReturn) o;
return Objects.equals(this._return, _return._return); return Objects.equals(_return, _return._return);
} }
@Override @Override

8
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Name.java
View File

@ -141,10 +141,10 @@ public class Name implements Serializable {
return false; return false;
} }
Name name = (Name) o; Name name = (Name) o;
return Objects.equals(this.name, name.name) && return Objects.equals(name, name.name) &&
Objects.equals(this.snakeCase, name.snakeCase) && Objects.equals(snakeCase, name.snakeCase) &&
Objects.equals(this.property, name.property) && Objects.equals(property, name.property) &&
Objects.equals(this._123number, name._123number); Objects.equals(_123number, name._123number);
} }
@Override @Override

2
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/NumberOnly.java
View File

@ -66,7 +66,7 @@ public class NumberOnly implements Serializable {
return false; return false;
} }
NumberOnly numberOnly = (NumberOnly) o; NumberOnly numberOnly = (NumberOnly) o;
return Objects.equals(this.justNumber, numberOnly.justNumber); return Objects.equals(justNumber, numberOnly.justNumber);
} }
@Override @Override

12
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Order.java
View File

@ -225,12 +225,12 @@ public class Order implements Serializable {
return false; return false;
} }
Order order = (Order) o; Order order = (Order) o;
return Objects.equals(this.id, order.id) && return Objects.equals(id, order.id) &&
Objects.equals(this.petId, order.petId) && Objects.equals(petId, order.petId) &&
Objects.equals(this.quantity, order.quantity) && Objects.equals(quantity, order.quantity) &&
Objects.equals(this.shipDate, order.shipDate) && Objects.equals(shipDate, order.shipDate) &&
Objects.equals(this.status, order.status) && Objects.equals(status, order.status) &&
Objects.equals(this.complete, order.complete); Objects.equals(complete, order.complete);
} }
@Override @Override

6
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/OuterComposite.java
View File

@ -116,9 +116,9 @@ public class OuterComposite implements Serializable {
return false; return false;
} }
OuterComposite outerComposite = (OuterComposite) o; OuterComposite outerComposite = (OuterComposite) o;
return Objects.equals(this.myNumber, outerComposite.myNumber) && return Objects.equals(myNumber, outerComposite.myNumber) &&
Objects.equals(this.myString, outerComposite.myString) && Objects.equals(myString, outerComposite.myString) &&
Objects.equals(this.myBoolean, outerComposite.myBoolean); Objects.equals(myBoolean, outerComposite.myBoolean);
} }
@Override @Override

12
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Pet.java
View File

@ -248,12 +248,12 @@ public class Pet implements Serializable {
return false; return false;
} }
Pet pet = (Pet) o; Pet pet = (Pet) o;
return Objects.equals(this.id, pet.id) && return Objects.equals(id, pet.id) &&
Objects.equals(this.category, pet.category) && Objects.equals(category, pet.category) &&
Objects.equals(this.name, pet.name) && Objects.equals(name, pet.name) &&
Objects.equals(this.photoUrls, pet.photoUrls) && Objects.equals(photoUrls, pet.photoUrls) &&
Objects.equals(this.tags, pet.tags) && Objects.equals(tags, pet.tags) &&
Objects.equals(this.status, pet.status); Objects.equals(status, pet.status);
} }
@Override @Override

4
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
View File

@ -90,8 +90,8 @@ public class ReadOnlyFirst implements Serializable {
return false; return false;
} }
ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o; ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
return Objects.equals(this.bar, readOnlyFirst.bar) && return Objects.equals(bar, readOnlyFirst.bar) &&
Objects.equals(this.baz, readOnlyFirst.baz); Objects.equals(baz, readOnlyFirst.baz);
} }
@Override @Override

2
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/SpecialModelName.java
View File

@ -66,7 +66,7 @@ public class SpecialModelName implements Serializable {
return false; return false;
} }
SpecialModelName $specialModelName = (SpecialModelName) o; SpecialModelName $specialModelName = (SpecialModelName) o;
return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName); return Objects.equals($specialPropertyName, $specialModelName.$specialPropertyName);
} }
@Override @Override

4
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/Tag.java
View File

@ -90,8 +90,8 @@ public class Tag implements Serializable {
return false; return false;
} }
Tag tag = (Tag) o; Tag tag = (Tag) o;
return Objects.equals(this.id, tag.id) && return Objects.equals(id, tag.id) &&
Objects.equals(this.name, tag.name); Objects.equals(name, tag.name);
} }
@Override @Override

10
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderDefault.java
View File

@ -176,11 +176,11 @@ public class TypeHolderDefault implements Serializable {
return false; return false;
} }
TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o; TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o;
return Objects.equals(this.stringItem, typeHolderDefault.stringItem) && return Objects.equals(stringItem, typeHolderDefault.stringItem) &&
Objects.equals(this.numberItem, typeHolderDefault.numberItem) && Objects.equals(numberItem, typeHolderDefault.numberItem) &&
Objects.equals(this.integerItem, typeHolderDefault.integerItem) && Objects.equals(integerItem, typeHolderDefault.integerItem) &&
Objects.equals(this.boolItem, typeHolderDefault.boolItem) && Objects.equals(boolItem, typeHolderDefault.boolItem) &&
Objects.equals(this.arrayItem, typeHolderDefault.arrayItem); Objects.equals(arrayItem, typeHolderDefault.arrayItem);
} }
@Override @Override

12
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/TypeHolderExample.java
View File

@ -201,12 +201,12 @@ public class TypeHolderExample implements Serializable {
return false; return false;
} }
TypeHolderExample typeHolderExample = (TypeHolderExample) o; TypeHolderExample typeHolderExample = (TypeHolderExample) o;
return Objects.equals(this.stringItem, typeHolderExample.stringItem) && return Objects.equals(stringItem, typeHolderExample.stringItem) &&
Objects.equals(this.numberItem, typeHolderExample.numberItem) && Objects.equals(numberItem, typeHolderExample.numberItem) &&
Objects.equals(this.floatItem, typeHolderExample.floatItem) && Objects.equals(floatItem, typeHolderExample.floatItem) &&
Objects.equals(this.integerItem, typeHolderExample.integerItem) && Objects.equals(integerItem, typeHolderExample.integerItem) &&
Objects.equals(this.boolItem, typeHolderExample.boolItem) && Objects.equals(boolItem, typeHolderExample.boolItem) &&
Objects.equals(this.arrayItem, typeHolderExample.arrayItem); Objects.equals(arrayItem, typeHolderExample.arrayItem);
} }
@Override @Override

16
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/User.java
View File

@ -240,14 +240,14 @@ public class User implements Serializable {
return false; return false;
} }
User user = (User) o; User user = (User) o;
return Objects.equals(this.id, user.id) && return Objects.equals(id, user.id) &&
Objects.equals(this.username, user.username) && Objects.equals(username, user.username) &&
Objects.equals(this.firstName, user.firstName) && Objects.equals(firstName, user.firstName) &&
Objects.equals(this.lastName, user.lastName) && Objects.equals(lastName, user.lastName) &&
Objects.equals(this.email, user.email) && Objects.equals(email, user.email) &&
Objects.equals(this.password, user.password) && Objects.equals(password, user.password) &&
Objects.equals(this.phone, user.phone) && Objects.equals(phone, user.phone) &&
Objects.equals(this.userStatus, user.userStatus); Objects.equals(userStatus, user.userStatus);
} }
@Override @Override

58
samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/XmlItem.java
View File

@ -840,35 +840,35 @@ public class XmlItem implements Serializable {
return false; return false;
} }
XmlItem xmlItem = (XmlItem) o; XmlItem xmlItem = (XmlItem) o;
return Objects.equals(this.attributeString, xmlItem.attributeString) && return Objects.equals(attributeString, xmlItem.attributeString) &&
Objects.equals(this.attributeNumber, xmlItem.attributeNumber) && Objects.equals(attributeNumber, xmlItem.attributeNumber) &&
Objects.equals(this.attributeInteger, xmlItem.attributeInteger) && Objects.equals(attributeInteger, xmlItem.attributeInteger) &&
Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) && Objects.equals(attributeBoolean, xmlItem.attributeBoolean) &&
Objects.equals(this.wrappedArray, xmlItem.wrappedArray) && Objects.equals(wrappedArray, xmlItem.wrappedArray) &&
Objects.equals(this.nameString, xmlItem.nameString) && Objects.equals(nameString, xmlItem.nameString) &&
Objects.equals(this.nameNumber, xmlItem.nameNumber) && Objects.equals(nameNumber, xmlItem.nameNumber) &&
Objects.equals(this.nameInteger, xmlItem.nameInteger) && Objects.equals(nameInteger, xmlItem.nameInteger) &&
Objects.equals(this.nameBoolean, xmlItem.nameBoolean) && Objects.equals(nameBoolean, xmlItem.nameBoolean) &&
Objects.equals(this.nameArray, xmlItem.nameArray) && Objects.equals(nameArray, xmlItem.nameArray) &&
Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) && Objects.equals(nameWrappedArray, xmlItem.nameWrappedArray) &&
Objects.equals(this.prefixString, xmlItem.prefixString) && Objects.equals(prefixString, xmlItem.prefixString) &&
Objects.equals(this.prefixNumber, xmlItem.prefixNumber) && Objects.equals(prefixNumber, xmlItem.prefixNumber) &&
Objects.equals(this.prefixInteger, xmlItem.prefixInteger) && Objects.equals(prefixInteger, xmlItem.prefixInteger) &&
Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) && Objects.equals(prefixBoolean, xmlItem.prefixBoolean) &&
Objects.equals(this.prefixArray, xmlItem.prefixArray) && Objects.equals(prefixArray, xmlItem.prefixArray) &&
Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) && Objects.equals(prefixWrappedArray, xmlItem.prefixWrappedArray) &&
Objects.equals(this.namespaceString, xmlItem.namespaceString) && Objects.equals(namespaceString, xmlItem.namespaceString) &&
Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) && Objects.equals(namespaceNumber, xmlItem.namespaceNumber) &&
Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) && Objects.equals(namespaceInteger, xmlItem.namespaceInteger) &&
Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) && Objects.equals(namespaceBoolean, xmlItem.namespaceBoolean) &&
Objects.equals(this.namespaceArray, xmlItem.namespaceArray) && Objects.equals(namespaceArray, xmlItem.namespaceArray) &&
Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) && Objects.equals(namespaceWrappedArray, xmlItem.namespaceWrappedArray) &&
Objects.equals(this.prefixNsString, xmlItem.prefixNsString) && Objects.equals(prefixNsString, xmlItem.prefixNsString) &&
Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) && Objects.equals(prefixNsNumber, xmlItem.prefixNsNumber) &&
Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) && Objects.equals(prefixNsInteger, xmlItem.prefixNsInteger) &&
Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) && Objects.equals(prefixNsBoolean, xmlItem.prefixNsBoolean) &&
Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) && Objects.equals(prefixNsArray, xmlItem.prefixNsArray) &&
Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray); Objects.equals(prefixNsWrappedArray, xmlItem.prefixNsWrappedArray);
} }
@Override @Override

4
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
View File

@ -107,8 +107,8 @@ public class AdditionalPropertiesClass {
return false; return false;
} }
AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o; AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
return Objects.equals(this.mapProperty, additionalPropertiesClass.mapProperty) && return Objects.equals(mapProperty, additionalPropertiesClass.mapProperty) &&
Objects.equals(this.mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty); Objects.equals(mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty);
} }
@Override @Override

4
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/AllOfWithSingleRef.java
View File

@ -91,8 +91,8 @@ public class AllOfWithSingleRef {
return false; return false;
} }
AllOfWithSingleRef allOfWithSingleRef = (AllOfWithSingleRef) o; AllOfWithSingleRef allOfWithSingleRef = (AllOfWithSingleRef) o;
return Objects.equals(this.username, allOfWithSingleRef.username) && return Objects.equals(username, allOfWithSingleRef.username) &&
Objects.equals(this.singleRefType, allOfWithSingleRef.singleRefType); Objects.equals(singleRefType, allOfWithSingleRef.singleRefType);
} }
@Override @Override

4
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Animal.java
View File

@ -97,8 +97,8 @@ public class Animal {
return false; return false;
} }
Animal animal = (Animal) o; Animal animal = (Animal) o;
return Objects.equals(this.className, animal.className) && return Objects.equals(className, animal.className) &&
Objects.equals(this.color, animal.color); Objects.equals(color, animal.color);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
View File

@ -75,7 +75,7 @@ public class ArrayOfArrayOfNumberOnly {
return false; return false;
} }
ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o; ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o;
return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber); return Objects.equals(arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayOfNumberOnly.java
View File

@ -75,7 +75,7 @@ public class ArrayOfNumberOnly {
return false; return false;
} }
ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o; ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o;
return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber); return Objects.equals(arrayNumber, arrayOfNumberOnly.arrayNumber);
} }
@Override @Override

6
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ArrayTest.java
View File

@ -141,9 +141,9 @@ public class ArrayTest {
return false; return false;
} }
ArrayTest arrayTest = (ArrayTest) o; ArrayTest arrayTest = (ArrayTest) o;
return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) && return Objects.equals(arrayOfString, arrayTest.arrayOfString) &&
Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) && Objects.equals(arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel); Objects.equals(arrayArrayOfModel, arrayTest.arrayArrayOfModel);
} }
@Override @Override

12
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Capitalization.java
View File

@ -189,12 +189,12 @@ public class Capitalization {
return false; return false;
} }
Capitalization capitalization = (Capitalization) o; Capitalization capitalization = (Capitalization) o;
return Objects.equals(this.smallCamel, capitalization.smallCamel) && return Objects.equals(smallCamel, capitalization.smallCamel) &&
Objects.equals(this.capitalCamel, capitalization.capitalCamel) && Objects.equals(capitalCamel, capitalization.capitalCamel) &&
Objects.equals(this.smallSnake, capitalization.smallSnake) && Objects.equals(smallSnake, capitalization.smallSnake) &&
Objects.equals(this.capitalSnake, capitalization.capitalSnake) && Objects.equals(capitalSnake, capitalization.capitalSnake) &&
Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) && Objects.equals(scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
Objects.equals(this.ATT_NAME, capitalization.ATT_NAME); Objects.equals(ATT_NAME, capitalization.ATT_NAME);
} }
@Override @Override

5
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Cat.java
View File

@ -65,13 +65,12 @@ public class Cat extends Animal {
return false; return false;
} }
Cat cat = (Cat) o; Cat cat = (Cat) o;
return Objects.equals(this.declawed, cat.declawed) && return super.equals(o) && Objects.equals(declawed, cat.declawed);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(declawed, super.hashCode()); return Objects.hash(super.hashCode(), declawed);
} }
@Override @Override

4
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Category.java
View File

@ -89,8 +89,8 @@ public class Category {
return false; return false;
} }
Category category = (Category) o; Category category = (Category) o;
return Objects.equals(this.id, category.id) && return Objects.equals(id, category.id) &&
Objects.equals(this.name, category.name); Objects.equals(name, category.name);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ClassModel.java
View File

@ -65,7 +65,7 @@ public class ClassModel {
return false; return false;
} }
ClassModel classModel = (ClassModel) o; ClassModel classModel = (ClassModel) o;
return Objects.equals(this.propertyClass, classModel.propertyClass); return Objects.equals(propertyClass, classModel.propertyClass);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Client.java
View File

@ -64,7 +64,7 @@ public class Client {
return false; return false;
} }
Client client = (Client) o; Client client = (Client) o;
return Objects.equals(this.client, client.client); return Objects.equals(client, client.client);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/DeprecatedObject.java
View File

@ -64,7 +64,7 @@ public class DeprecatedObject {
return false; return false;
} }
DeprecatedObject deprecatedObject = (DeprecatedObject) o; DeprecatedObject deprecatedObject = (DeprecatedObject) o;
return Objects.equals(this.name, deprecatedObject.name); return Objects.equals(name, deprecatedObject.name);
} }
@Override @Override

5
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Dog.java
View File

@ -65,13 +65,12 @@ public class Dog extends Animal {
return false; return false;
} }
Dog dog = (Dog) o; Dog dog = (Dog) o;
return Objects.equals(this.breed, dog.breed) && return super.equals(o) && Objects.equals(breed, dog.breed);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(breed, super.hashCode()); return Objects.hash(super.hashCode(), breed);
} }
@Override @Override

4
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumArrays.java
View File

@ -162,8 +162,8 @@ public class EnumArrays {
return false; return false;
} }
EnumArrays enumArrays = (EnumArrays) o; EnumArrays enumArrays = (EnumArrays) o;
return Objects.equals(this.justSymbol, enumArrays.justSymbol) && return Objects.equals(justSymbol, enumArrays.justSymbol) &&
Objects.equals(this.arrayEnum, enumArrays.arrayEnum); Objects.equals(arrayEnum, enumArrays.arrayEnum);
} }
@Override @Override

16
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/EnumTest.java
View File

@ -373,14 +373,14 @@ public class EnumTest {
return false; return false;
} }
EnumTest enumTest = (EnumTest) o; EnumTest enumTest = (EnumTest) o;
return Objects.equals(this.enumString, enumTest.enumString) && return Objects.equals(enumString, enumTest.enumString) &&
Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) && Objects.equals(enumStringRequired, enumTest.enumStringRequired) &&
Objects.equals(this.enumInteger, enumTest.enumInteger) && Objects.equals(enumInteger, enumTest.enumInteger) &&
Objects.equals(this.enumNumber, enumTest.enumNumber) && Objects.equals(enumNumber, enumTest.enumNumber) &&
Objects.equals(this.outerEnum, enumTest.outerEnum) && Objects.equals(outerEnum, enumTest.outerEnum) &&
Objects.equals(this.outerEnumInteger, enumTest.outerEnumInteger) && Objects.equals(outerEnumInteger, enumTest.outerEnumInteger) &&
Objects.equals(this.outerEnumDefaultValue, enumTest.outerEnumDefaultValue) && Objects.equals(outerEnumDefaultValue, enumTest.outerEnumDefaultValue) &&
Objects.equals(this.outerEnumIntegerDefaultValue, enumTest.outerEnumIntegerDefaultValue); Objects.equals(outerEnumIntegerDefaultValue, enumTest.outerEnumIntegerDefaultValue);
} }
@Override @Override

4
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java
View File

@ -101,8 +101,8 @@ public class FakeBigDecimalMap200Response {
return false; return false;
} }
FakeBigDecimalMap200Response fakeBigDecimalMap200Response = (FakeBigDecimalMap200Response) o; FakeBigDecimalMap200Response fakeBigDecimalMap200Response = (FakeBigDecimalMap200Response) o;
return Objects.equals(this.someId, fakeBigDecimalMap200Response.someId) && return Objects.equals(someId, fakeBigDecimalMap200Response.someId) &&
Objects.equals(this.someMap, fakeBigDecimalMap200Response.someMap); Objects.equals(someMap, fakeBigDecimalMap200Response.someMap);
} }
@Override @Override

4
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FileSchemaTestClass.java
View File

@ -100,8 +100,8 @@ public class FileSchemaTestClass {
return false; return false;
} }
FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o; FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
return Objects.equals(this._file, fileSchemaTestClass._file) && return Objects.equals(_file, fileSchemaTestClass._file) &&
Objects.equals(this.files, fileSchemaTestClass.files); Objects.equals(files, fileSchemaTestClass.files);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Foo.java
View File

@ -64,7 +64,7 @@ public class Foo {
return false; return false;
} }
Foo foo = (Foo) o; Foo foo = (Foo) o;
return Objects.equals(this.bar, foo.bar); return Objects.equals(bar, foo.bar);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
View File

@ -66,7 +66,7 @@ public class FooGetDefaultResponse {
return false; return false;
} }
FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o; FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
return Objects.equals(this.string, fooGetDefaultResponse.string); return Objects.equals(string, fooGetDefaultResponse.string);
} }
@Override @Override

32
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java
View File

@ -454,22 +454,22 @@ public class FormatTest {
return false; return false;
} }
FormatTest formatTest = (FormatTest) o; FormatTest formatTest = (FormatTest) o;
return Objects.equals(this.integer, formatTest.integer) && return Objects.equals(integer, formatTest.integer) &&
Objects.equals(this.int32, formatTest.int32) && Objects.equals(int32, formatTest.int32) &&
Objects.equals(this.int64, formatTest.int64) && Objects.equals(int64, formatTest.int64) &&
Objects.equals(this.number, formatTest.number) && Objects.equals(number, formatTest.number) &&
Objects.equals(this._float, formatTest._float) && Objects.equals(_float, formatTest._float) &&
Objects.equals(this._double, formatTest._double) && Objects.equals(_double, formatTest._double) &&
Objects.equals(this.decimal, formatTest.decimal) && Objects.equals(decimal, formatTest.decimal) &&
Objects.equals(this.string, formatTest.string) && Objects.equals(string, formatTest.string) &&
Objects.equals(this._byte, formatTest._byte) && Objects.equals(_byte, formatTest._byte) &&
Objects.equals(this.binary, formatTest.binary) && Objects.equals(binary, formatTest.binary) &&
Objects.equals(this.date, formatTest.date) && Objects.equals(date, formatTest.date) &&
Objects.equals(this.dateTime, formatTest.dateTime) && Objects.equals(dateTime, formatTest.dateTime) &&
Objects.equals(this.uuid, formatTest.uuid) && Objects.equals(uuid, formatTest.uuid) &&
Objects.equals(this.password, formatTest.password) && Objects.equals(password, formatTest.password) &&
Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) && Objects.equals(patternWithDigits, formatTest.patternWithDigits) &&
Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter); Objects.equals(patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
} }
@Override @Override

4
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
View File

@ -90,8 +90,8 @@ public class HasOnlyReadOnly {
return false; return false;
} }
HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o; HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o;
return Objects.equals(this.bar, hasOnlyReadOnly.bar) && return Objects.equals(bar, hasOnlyReadOnly.bar) &&
Objects.equals(this.foo, hasOnlyReadOnly.foo); Objects.equals(foo, hasOnlyReadOnly.foo);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/HealthCheckResult.java
View File

@ -65,7 +65,7 @@ public class HealthCheckResult {
return false; return false;
} }
HealthCheckResult healthCheckResult = (HealthCheckResult) o; HealthCheckResult healthCheckResult = (HealthCheckResult) o;
return Objects.equals(this.nullableMessage, healthCheckResult.nullableMessage); return Objects.equals(nullableMessage, healthCheckResult.nullableMessage);
} }
@Override @Override

8
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MapTest.java
View File

@ -205,10 +205,10 @@ public class MapTest {
return false; return false;
} }
MapTest mapTest = (MapTest) o; MapTest mapTest = (MapTest) o;
return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) && return Objects.equals(mapMapOfString, mapTest.mapMapOfString) &&
Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) && Objects.equals(mapOfEnumString, mapTest.mapOfEnumString) &&
Objects.equals(this.directMap, mapTest.directMap) && Objects.equals(directMap, mapTest.directMap) &&
Objects.equals(this.indirectMap, mapTest.indirectMap); Objects.equals(indirectMap, mapTest.indirectMap);
} }
@Override @Override

6
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
View File

@ -127,9 +127,9 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
return false; return false;
} }
MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o; MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) && return Objects.equals(uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) && Objects.equals(dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map); Objects.equals(map, mixedPropertiesAndAdditionalPropertiesClass.map);
} }
@Override @Override

4
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Model200Response.java
View File

@ -91,8 +91,8 @@ public class Model200Response {
return false; return false;
} }
Model200Response _200response = (Model200Response) o; Model200Response _200response = (Model200Response) o;
return Objects.equals(this.name, _200response.name) && return Objects.equals(name, _200response.name) &&
Objects.equals(this.propertyClass, _200response.propertyClass); Objects.equals(propertyClass, _200response.propertyClass);
} }
@Override @Override

6
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelApiResponse.java
View File

@ -115,9 +115,9 @@ public class ModelApiResponse {
return false; return false;
} }
ModelApiResponse _apiResponse = (ModelApiResponse) o; ModelApiResponse _apiResponse = (ModelApiResponse) o;
return Objects.equals(this.code, _apiResponse.code) && return Objects.equals(code, _apiResponse.code) &&
Objects.equals(this.type, _apiResponse.type) && Objects.equals(type, _apiResponse.type) &&
Objects.equals(this.message, _apiResponse.message); Objects.equals(message, _apiResponse.message);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelFile.java
View File

@ -66,7 +66,7 @@ public class ModelFile {
return false; return false;
} }
ModelFile _file = (ModelFile) o; ModelFile _file = (ModelFile) o;
return Objects.equals(this.sourceURI, _file.sourceURI); return Objects.equals(sourceURI, _file.sourceURI);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelList.java
View File

@ -65,7 +65,7 @@ public class ModelList {
return false; return false;
} }
ModelList _list = (ModelList) o; ModelList _list = (ModelList) o;
return Objects.equals(this._123list, _list._123list); return Objects.equals(_123list, _list._123list);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ModelReturn.java
View File

@ -66,7 +66,7 @@ public class ModelReturn {
return false; return false;
} }
ModelReturn _return = (ModelReturn) o; ModelReturn _return = (ModelReturn) o;
return Objects.equals(this._return, _return._return); return Objects.equals(_return, _return._return);
} }
@Override @Override

8
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Name.java
View File

@ -140,10 +140,10 @@ public class Name {
return false; return false;
} }
Name name = (Name) o; Name name = (Name) o;
return Objects.equals(this.name, name.name) && return Objects.equals(name, name.name) &&
Objects.equals(this.snakeCase, name.snakeCase) && Objects.equals(snakeCase, name.snakeCase) &&
Objects.equals(this.property, name.property) && Objects.equals(property, name.property) &&
Objects.equals(this._123number, name._123number); Objects.equals(_123number, name._123number);
} }
@Override @Override

27
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java
View File

@ -393,24 +393,23 @@ public class NullableClass extends HashMap<String, Object> {
return false; return false;
} }
NullableClass nullableClass = (NullableClass) o; NullableClass nullableClass = (NullableClass) o;
return Objects.equals(this.integerProp, nullableClass.integerProp) && return super.equals(o) && Objects.equals(integerProp, nullableClass.integerProp) &&
Objects.equals(this.numberProp, nullableClass.numberProp) && Objects.equals(numberProp, nullableClass.numberProp) &&
Objects.equals(this.booleanProp, nullableClass.booleanProp) && Objects.equals(booleanProp, nullableClass.booleanProp) &&
Objects.equals(this.stringProp, nullableClass.stringProp) && Objects.equals(stringProp, nullableClass.stringProp) &&
Objects.equals(this.dateProp, nullableClass.dateProp) && Objects.equals(dateProp, nullableClass.dateProp) &&
Objects.equals(this.datetimeProp, nullableClass.datetimeProp) && Objects.equals(datetimeProp, nullableClass.datetimeProp) &&
Objects.equals(this.arrayNullableProp, nullableClass.arrayNullableProp) && Objects.equals(arrayNullableProp, nullableClass.arrayNullableProp) &&
Objects.equals(this.arrayAndItemsNullableProp, nullableClass.arrayAndItemsNullableProp) && Objects.equals(arrayAndItemsNullableProp, nullableClass.arrayAndItemsNullableProp) &&
Objects.equals(this.arrayItemsNullable, nullableClass.arrayItemsNullable) && Objects.equals(arrayItemsNullable, nullableClass.arrayItemsNullable) &&
Objects.equals(this.objectNullableProp, nullableClass.objectNullableProp) && Objects.equals(objectNullableProp, nullableClass.objectNullableProp) &&
Objects.equals(this.objectAndItemsNullableProp, nullableClass.objectAndItemsNullableProp) && Objects.equals(objectAndItemsNullableProp, nullableClass.objectAndItemsNullableProp) &&
Objects.equals(this.objectItemsNullable, nullableClass.objectItemsNullable) && Objects.equals(objectItemsNullable, nullableClass.objectItemsNullable);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable, super.hashCode()); return Objects.hash(super.hashCode(), integerProp, super.hashCode(), numberProp, super.hashCode(), booleanProp, super.hashCode(), stringProp, super.hashCode(), dateProp, super.hashCode(), datetimeProp, super.hashCode(), arrayNullableProp, super.hashCode(), arrayAndItemsNullableProp, super.hashCode(), arrayItemsNullable, super.hashCode(), objectNullableProp, super.hashCode(), objectAndItemsNullableProp, super.hashCode(), objectItemsNullable);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NumberOnly.java
View File

@ -65,7 +65,7 @@ public class NumberOnly {
return false; return false;
} }
NumberOnly numberOnly = (NumberOnly) o; NumberOnly numberOnly = (NumberOnly) o;
return Objects.equals(this.justNumber, numberOnly.justNumber); return Objects.equals(justNumber, numberOnly.justNumber);
} }
@Override @Override

8
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
View File

@ -151,10 +151,10 @@ public class ObjectWithDeprecatedFields {
return false; return false;
} }
ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o; ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) && return Objects.equals(uuid, objectWithDeprecatedFields.uuid) &&
Objects.equals(this.id, objectWithDeprecatedFields.id) && Objects.equals(id, objectWithDeprecatedFields.id) &&
Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) && Objects.equals(deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
Objects.equals(this.bars, objectWithDeprecatedFields.bars); Objects.equals(bars, objectWithDeprecatedFields.bars);
} }
@Override @Override

12
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Order.java
View File

@ -224,12 +224,12 @@ public class Order {
return false; return false;
} }
Order order = (Order) o; Order order = (Order) o;
return Objects.equals(this.id, order.id) && return Objects.equals(id, order.id) &&
Objects.equals(this.petId, order.petId) && Objects.equals(petId, order.petId) &&
Objects.equals(this.quantity, order.quantity) && Objects.equals(quantity, order.quantity) &&
Objects.equals(this.shipDate, order.shipDate) && Objects.equals(shipDate, order.shipDate) &&
Objects.equals(this.status, order.status) && Objects.equals(status, order.status) &&
Objects.equals(this.complete, order.complete); Objects.equals(complete, order.complete);
} }
@Override @Override

6
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterComposite.java
View File

@ -115,9 +115,9 @@ public class OuterComposite {
return false; return false;
} }
OuterComposite outerComposite = (OuterComposite) o; OuterComposite outerComposite = (OuterComposite) o;
return Objects.equals(this.myNumber, outerComposite.myNumber) && return Objects.equals(myNumber, outerComposite.myNumber) &&
Objects.equals(this.myString, outerComposite.myString) && Objects.equals(myString, outerComposite.myString) &&
Objects.equals(this.myBoolean, outerComposite.myBoolean); Objects.equals(myBoolean, outerComposite.myBoolean);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java
View File

@ -66,7 +66,7 @@ public class OuterObjectWithEnumProperty {
return false; return false;
} }
OuterObjectWithEnumProperty outerObjectWithEnumProperty = (OuterObjectWithEnumProperty) o; OuterObjectWithEnumProperty outerObjectWithEnumProperty = (OuterObjectWithEnumProperty) o;
return Objects.equals(this.value, outerObjectWithEnumProperty.value); return Objects.equals(value, outerObjectWithEnumProperty.value);
} }
@Override @Override

12
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Pet.java
View File

@ -247,12 +247,12 @@ public class Pet {
return false; return false;
} }
Pet pet = (Pet) o; Pet pet = (Pet) o;
return Objects.equals(this.id, pet.id) && return Objects.equals(id, pet.id) &&
Objects.equals(this.category, pet.category) && Objects.equals(category, pet.category) &&
Objects.equals(this.name, pet.name) && Objects.equals(name, pet.name) &&
Objects.equals(this.photoUrls, pet.photoUrls) && Objects.equals(photoUrls, pet.photoUrls) &&
Objects.equals(this.tags, pet.tags) && Objects.equals(tags, pet.tags) &&
Objects.equals(this.status, pet.status); Objects.equals(status, pet.status);
} }
@Override @Override

4
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ReadOnlyFirst.java
View File

@ -89,8 +89,8 @@ public class ReadOnlyFirst {
return false; return false;
} }
ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o; ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
return Objects.equals(this.bar, readOnlyFirst.bar) && return Objects.equals(bar, readOnlyFirst.bar) &&
Objects.equals(this.baz, readOnlyFirst.baz); Objects.equals(baz, readOnlyFirst.baz);
} }
@Override @Override

2
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/SpecialModelName.java
View File

@ -65,7 +65,7 @@ public class SpecialModelName {
return false; return false;
} }
SpecialModelName specialModelName = (SpecialModelName) o; SpecialModelName specialModelName = (SpecialModelName) o;
return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName); return Objects.equals($specialPropertyName, specialModelName.$specialPropertyName);
} }
@Override @Override

4
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/Tag.java
View File

@ -89,8 +89,8 @@ public class Tag {
return false; return false;
} }
Tag tag = (Tag) o; Tag tag = (Tag) o;
return Objects.equals(this.id, tag.id) && return Objects.equals(id, tag.id) &&
Objects.equals(this.name, tag.name); Objects.equals(name, tag.name);
} }
@Override @Override

16
samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/User.java
View File

@ -239,14 +239,14 @@ public class User {
return false; return false;
} }
User user = (User) o; User user = (User) o;
return Objects.equals(this.id, user.id) && return Objects.equals(id, user.id) &&
Objects.equals(this.username, user.username) && Objects.equals(username, user.username) &&
Objects.equals(this.firstName, user.firstName) && Objects.equals(firstName, user.firstName) &&
Objects.equals(this.lastName, user.lastName) && Objects.equals(lastName, user.lastName) &&
Objects.equals(this.email, user.email) && Objects.equals(email, user.email) &&
Objects.equals(this.password, user.password) && Objects.equals(password, user.password) &&
Objects.equals(this.phone, user.phone) && Objects.equals(phone, user.phone) &&
Objects.equals(this.userStatus, user.userStatus); Objects.equals(userStatus, user.userStatus);
} }
@Override @Override

5
samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesAnyType.java
View File

@ -66,13 +66,12 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
return false; return false;
} }
AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o; AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
return Objects.equals(this.name, additionalPropertiesAnyType.name) && return super.equals(o) && Objects.equals(name, additionalPropertiesAnyType.name);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(name, super.hashCode()); return Objects.hash(super.hashCode(), name);
} }
@Override @Override

5
samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesArray.java
View File

@ -67,13 +67,12 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
return false; return false;
} }
AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o; AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
return Objects.equals(this.name, additionalPropertiesArray.name) && return super.equals(o) && Objects.equals(name, additionalPropertiesArray.name);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(name, super.hashCode()); return Objects.hash(super.hashCode(), name);
} }
@Override @Override

5
samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesBoolean.java
View File

@ -66,13 +66,12 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
return false; return false;
} }
AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o; AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
return Objects.equals(this.name, additionalPropertiesBoolean.name) && return super.equals(o) && Objects.equals(name, additionalPropertiesBoolean.name);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(name, super.hashCode()); return Objects.hash(super.hashCode(), name);
} }
@Override @Override

22
samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesClass.java
View File

@ -382,17 +382,17 @@ public class AdditionalPropertiesClass {
return false; return false;
} }
AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o; AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
return Objects.equals(this.mapString, additionalPropertiesClass.mapString) && return Objects.equals(mapString, additionalPropertiesClass.mapString) &&
Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) && Objects.equals(mapNumber, additionalPropertiesClass.mapNumber) &&
Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) && Objects.equals(mapInteger, additionalPropertiesClass.mapInteger) &&
Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) && Objects.equals(mapBoolean, additionalPropertiesClass.mapBoolean) &&
Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) && Objects.equals(mapArrayInteger, additionalPropertiesClass.mapArrayInteger) &&
Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) && Objects.equals(mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) &&
Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) && Objects.equals(mapMapString, additionalPropertiesClass.mapMapString) &&
Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) && Objects.equals(mapMapAnytype, additionalPropertiesClass.mapMapAnytype) &&
Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) && Objects.equals(anytype1, additionalPropertiesClass.anytype1) &&
Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) && Objects.equals(anytype2, additionalPropertiesClass.anytype2) &&
Objects.equals(this.anytype3, additionalPropertiesClass.anytype3); Objects.equals(anytype3, additionalPropertiesClass.anytype3);
} }
@Override @Override

5
samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesInteger.java
View File

@ -66,13 +66,12 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
return false; return false;
} }
AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o; AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
return Objects.equals(this.name, additionalPropertiesInteger.name) && return super.equals(o) && Objects.equals(name, additionalPropertiesInteger.name);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(name, super.hashCode()); return Objects.hash(super.hashCode(), name);
} }
@Override @Override

5
samples/server/petstore/jaxrs/jersey1-useTags/src/gen/java/org/openapitools/model/AdditionalPropertiesNumber.java
View File

@ -67,13 +67,12 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
return false; return false;
} }
AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o; AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
return Objects.equals(this.name, additionalPropertiesNumber.name) && return super.equals(o) && Objects.equals(name, additionalPropertiesNumber.name);
super.equals(o);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(name, super.hashCode()); return Objects.hash(super.hashCode(), name);
} }
@Override @Override

Some files were not shown because too many files have changed in this diff Show More