remove jdk 6 support (#11558)

This commit is contained in:
William Cheng 2022-02-10 11:24:40 +08:00 committed by GitHub
parent fdb58f597c
commit 25b55c8c2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
278 changed files with 0 additions and 328 deletions

View File

@ -2,12 +2,7 @@
package {{package}};
{{^supportJava6}}
import java.util.Objects;
{{/supportJava6}}
{{#supportJava6}}
import org.apache.commons.lang3.ObjectUtils;
{{/supportJava6}}
{{#imports}}import {{import}};
{{/imports}}
{{#jackson}}

View File

@ -102,7 +102,6 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#serializable
{{/vars}}
{{^supportJava6}}
@Override
public boolean equals(Object o) {
if (this == o) {
@ -123,30 +122,6 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#serializable
return Objects.hash({{#vars}}{{name}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}});
}
{{/supportJava6}}
{{#supportJava6}}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}{{#hasVars}}
{{classname}} {{classVarName}} = ({{classname}}) o;
return {{#vars}}ObjectUtils.equals(this.{{name}}, {{classVarName}}.{{name}}){{^-last}} &&
{{/-last}}{{/vars}}{{#parent}} &&
super.equals(o){{/parent}};{{/hasVars}}{{^hasVars}}
return true;{{/hasVars}}
}
@Override
public int hashCode() {
return ObjectUtils.hashCodeMulti({{#vars}}{{name}}{{^-last}}, {{/-last}}{{/vars}}{{#parent}}{{#hasVars}}, {{/hasVars}}super.hashCode(){{/parent}});
}
{{/supportJava6}}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -177,21 +177,6 @@
<version>2.3.3</version>
<scope>runtime</scope>
</dependency>
{{#supportJava6}}
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons_lang3_version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons_io_version}</version>
</dependency>
{{/supportJava6}}
{{#useBeanValidation}}
<!-- Bean Validation API support -->
<dependency>
@ -223,10 +208,6 @@
<jetty-version>9.2.9.v20150224</jetty-version>
<jersey2-version>2.22.2</jersey2-version>
<jackson-version>2.9.9</jackson-version>
{{#supportJava6}}
<commons_io_version>2.5</commons_io_version>
<commons_lang3_version>3.5</commons_lang3_version>
{{/supportJava6}}
<junit-version>4.13.1</junit-version>
<logback-version>1.2.0</logback-version>
<servlet-api-version>4.0.4</servlet-api-version>

View File

@ -168,8 +168,6 @@
<version>2.3.3</version>
<scope>runtime</scope>
</dependency>
<!-- Bean Validation API support -->
<dependency>
<groupId>jakarta.validation</groupId>

View File

@ -76,7 +76,6 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> impleme
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -77,7 +77,6 @@ public class AdditionalPropertiesArray extends HashMap<String, List> implements
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -76,7 +76,6 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implem
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -401,7 +401,6 @@ public class AdditionalPropertiesClass implements Serializable {
return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -76,7 +76,6 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> implem
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -77,7 +77,6 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> impl
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -76,7 +76,6 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> implements
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -76,7 +76,6 @@ public class AdditionalPropertiesString extends HashMap<String, String> implemen
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -107,7 +107,6 @@ public class Animal implements Serializable {
return Objects.hash(className, color);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -84,7 +84,6 @@ public class ArrayOfArrayOfNumberOnly implements Serializable {
return Objects.hash(arrayArrayNumber);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -84,7 +84,6 @@ public class ArrayOfNumberOnly implements Serializable {
return Objects.hash(arrayNumber);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -152,7 +152,6 @@ public class ArrayTest implements Serializable {
return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -112,7 +112,6 @@ public class BigCat extends Cat implements Serializable {
return Objects.hash(kind, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -110,7 +110,6 @@ public class BigCatAllOf implements Serializable {
return Objects.hash(kind);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -203,7 +203,6 @@ public class Capitalization implements Serializable {
return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -76,7 +76,6 @@ public class Cat extends Animal implements Serializable {
return Objects.hash(declawed, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -74,7 +74,6 @@ public class CatAllOf implements Serializable {
return Objects.hash(declawed);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -99,7 +99,6 @@ public class Category implements Serializable {
return Objects.hash(id, name);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -74,7 +74,6 @@ public class ClassModel implements Serializable {
return Objects.hash(propertyClass);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -73,7 +73,6 @@ public class Client implements Serializable {
return Objects.hash(client);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -76,7 +76,6 @@ public class Dog extends Animal implements Serializable {
return Objects.hash(breed, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -74,7 +74,6 @@ public class DogAllOf implements Serializable {
return Objects.hash(breed);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -172,7 +172,6 @@ public class EnumArrays implements Serializable {
return Objects.hash(justSymbol, arrayEnum);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -308,7 +308,6 @@ public class EnumTest implements Serializable {
return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -110,7 +110,6 @@ public class FileSchemaTestClass implements Serializable {
return Objects.hash(_file, files);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -427,7 +427,6 @@ public class FormatTest implements Serializable {
return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -100,7 +100,6 @@ public class HasOnlyReadOnly implements Serializable {
return Objects.hash(bar, foo);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -218,7 +218,6 @@ public class MapTest implements Serializable {
return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -139,7 +139,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Serializabl
return Objects.hash(uuid, dateTime, map);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -101,7 +101,6 @@ public class Model200Response implements Serializable {
return Objects.hash(name, propertyClass);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -126,7 +126,6 @@ public class ModelApiResponse implements Serializable {
return Objects.hash(code, type, message);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -75,7 +75,6 @@ public class ModelFile implements Serializable {
return Objects.hash(sourceURI);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -74,7 +74,6 @@ public class ModelList implements Serializable {
return Objects.hash(_123list);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -75,7 +75,6 @@ public class ModelReturn implements Serializable {
return Objects.hash(_return);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -152,7 +152,6 @@ public class Name implements Serializable {
return Objects.hash(name, snakeCase, property, _123number);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -74,7 +74,6 @@ public class NumberOnly implements Serializable {
return Objects.hash(justNumber);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -238,7 +238,6 @@ public class Order implements Serializable {
return Objects.hash(id, petId, quantity, shipDate, status, complete);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -126,7 +126,6 @@ public class OuterComposite implements Serializable {
return Objects.hash(myNumber, myString, myBoolean);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -258,7 +258,6 @@ public class Pet implements Serializable {
return Objects.hash(id, category, name, photoUrls, tags, status);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -99,7 +99,6 @@ public class ReadOnlyFirst implements Serializable {
return Objects.hash(bar, baz);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -74,7 +74,6 @@ public class SpecialModelName implements Serializable {
return Objects.hash($specialPropertyName);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -99,7 +99,6 @@ public class Tag implements Serializable {
return Objects.hash(id, name);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -185,7 +185,6 @@ public class TypeHolderDefault implements Serializable {
return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -211,7 +211,6 @@ public class TypeHolderExample implements Serializable {
return Objects.hash(stringItem, numberItem, floatItem, integerItem, boolItem, arrayItem);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -255,7 +255,6 @@ public class User implements Serializable {
return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -876,7 +876,6 @@ public class XmlItem implements Serializable {
return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -168,8 +168,6 @@
<version>2.3.3</version>
<scope>runtime</scope>
</dependency>
<!-- Bean Validation API support -->
<dependency>
<groupId>jakarta.validation</groupId>

View File

@ -117,7 +117,6 @@ public class AdditionalPropertiesClass {
return Objects.hash(mapProperty, mapOfMapProperty);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -105,7 +105,6 @@ public class Animal {
return Objects.hash(className, color);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -83,7 +83,6 @@ public class ArrayOfArrayOfNumberOnly {
return Objects.hash(arrayArrayNumber);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -83,7 +83,6 @@ public class ArrayOfNumberOnly {
return Objects.hash(arrayNumber);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -151,7 +151,6 @@ public class ArrayTest {
return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -202,7 +202,6 @@ public class Capitalization {
return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -75,7 +75,6 @@ public class Cat extends Animal {
return Objects.hash(declawed, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -73,7 +73,6 @@ public class CatAllOf {
return Objects.hash(declawed);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -98,7 +98,6 @@ public class Category {
return Objects.hash(id, name);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -73,7 +73,6 @@ public class ClassModel {
return Objects.hash(propertyClass);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -72,7 +72,6 @@ public class Client {
return Objects.hash(client);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -72,7 +72,6 @@ public class DeprecatedObject {
return Objects.hash(name);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -75,7 +75,6 @@ public class Dog extends Animal {
return Objects.hash(breed, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -73,7 +73,6 @@ public class DogAllOf {
return Objects.hash(breed);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -171,7 +171,6 @@ public class EnumArrays {
return Objects.hash(justSymbol, arrayEnum);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -388,7 +388,6 @@ public class EnumTest {
return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -109,7 +109,6 @@ public class FileSchemaTestClass {
return Objects.hash(_file, files);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -72,7 +72,6 @@ public class Foo {
return Objects.hash(bar);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -477,7 +477,6 @@ public class FormatTest {
return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, _byte, binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -99,7 +99,6 @@ public class HasOnlyReadOnly {
return Objects.hash(bar, foo);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -73,7 +73,6 @@ public class HealthCheckResult {
return Objects.hash(nullableMessage);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -74,7 +74,6 @@ public class InlineResponseDefault {
return Objects.hash(string);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -217,7 +217,6 @@ public class MapTest {
return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -138,7 +138,6 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
return Objects.hash(uuid, dateTime, map);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -100,7 +100,6 @@ public class Model200Response {
return Objects.hash(name, propertyClass);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -125,7 +125,6 @@ public class ModelApiResponse {
return Objects.hash(code, type, message);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -74,7 +74,6 @@ public class ModelFile {
return Objects.hash(sourceURI);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -73,7 +73,6 @@ public class ModelList {
return Objects.hash(_123list);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -74,7 +74,6 @@ public class ModelReturn {
return Objects.hash(_return);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -151,7 +151,6 @@ public class Name {
return Objects.hash(name, snakeCase, property, _123number);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -413,7 +413,6 @@ public class NullableClass extends HashMap<String, Object> {
return Objects.hash(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -73,7 +73,6 @@ public class NumberOnly {
return Objects.hash(justNumber);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -162,7 +162,6 @@ public class ObjectWithDeprecatedFields {
return Objects.hash(uuid, id, deprecatedRef, bars);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -237,7 +237,6 @@ public class Order {
return Objects.hash(id, petId, quantity, shipDate, status, complete);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -125,7 +125,6 @@ public class OuterComposite {
return Objects.hash(myNumber, myString, myBoolean);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -73,7 +73,6 @@ public class OuterObjectWithEnumProperty {
return Objects.hash(value);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -257,7 +257,6 @@ public class Pet {
return Objects.hash(id, category, name, photoUrls, tags, status);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -98,7 +98,6 @@ public class ReadOnlyFirst {
return Objects.hash(bar, baz);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -73,7 +73,6 @@ public class SpecialModelName {
return Objects.hash($specialPropertyName);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -98,7 +98,6 @@ public class Tag {
return Objects.hash(id, name);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -254,7 +254,6 @@ public class User {
return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -75,7 +75,6 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -76,7 +76,6 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -75,7 +75,6 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -400,7 +400,6 @@ public class AdditionalPropertiesClass {
return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -75,7 +75,6 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -76,7 +76,6 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -75,7 +75,6 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

View File

@ -75,7 +75,6 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
return Objects.hash(name, super.hashCode());
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();

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