From 831b15cce131078a7dccff6b0f3f1ac910dc2f24 Mon Sep 17 00:00:00 2001 From: cal101 <cal101@users.noreply.github.com> Date: Sun, 14 Feb 2021 12:58:51 +0000 Subject: [PATCH] [cleanup] erefactor/EclipseJdt - Remove unnecessary casts EclipseJdt cleanup 'RemoveUnnecessaryCast' applied by erefactor. For EclipseJdt see https://www.eclipse.org/eclipse/news/4.18/jdt.php For erefactor see https://github.com/cal101/erefactor --- .../main/java/org/openapitools/codegen/DefaultCodegen.java | 2 +- .../java/org/openapitools/codegen/InlineModelResolver.java | 6 +++--- .../openapitools/codegen/languages/ErlangClientCodegen.java | 2 +- .../codegen/languages/JavaCXFExtServerCodegen.java | 4 ++-- .../org/openapitools/codegen/languages/K6ClientCodegen.java | 2 +- .../openapitools/codegen/languages/KtormSchemaCodegen.java | 2 +- .../openapitools/codegen/languages/MysqlSchemaCodegen.java | 2 +- .../codegen/languages/PhpSlim4ServerCodegen.java | 2 +- .../openapitools/codegen/languages/Swift5ClientCodegen.java | 2 +- .../openapitools/codegen/mysql/MysqlSchemaCodegenTest.java | 6 +++--- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index cf41b32b3d3..1cfdc143728 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -6379,7 +6379,7 @@ public class DefaultCodegen implements CodegenConfig { CodegenModel cm = new CodegenModel(); - cm.discriminator = createDiscriminator("", (Schema) cs, openAPI); + cm.discriminator = createDiscriminator("", cs, openAPI); if (!this.getLegacyDiscriminatorBehavior()) { cm.addDiscriminatorMappedModelsImports(); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java index 95aaf46b6fa..e2df896f945 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java @@ -118,7 +118,7 @@ public class InlineModelResolver { Schema model = ModelUtils.getSchemaFromRequestBody(requestBody); if (model instanceof ObjectSchema) { - Schema obj = (Schema) model; + Schema obj = model; if (obj.getType() == null || "object".equals(obj.getType())) { if (obj.getProperties() != null && obj.getProperties().size() > 0) { flattenProperties(openAPI, obj.getProperties(), pathname); @@ -213,7 +213,7 @@ public class InlineModelResolver { Schema model = parameter.getSchema(); if (model instanceof ObjectSchema) { - Schema obj = (Schema) model; + Schema obj = model; if (obj.getType() == null || "object".equals(obj.getType())) { if (obj.getProperties() != null && obj.getProperties().size() > 0) { flattenProperties(openAPI, obj.getProperties(), pathname); @@ -431,7 +431,7 @@ public class InlineModelResolver { flattenComposedChildren(openAPI, modelName + "_anyOf", m.getAnyOf()); flattenComposedChildren(openAPI, modelName + "_oneOf", m.getOneOf()); } else if (model instanceof Schema) { - Schema m = (Schema) model; + Schema m = model; Map<String, Schema> properties = m.getProperties(); flattenProperties(openAPI, properties, modelName); fixStringModel(m); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java index cc88d963442..f8c64d9e6d0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ErlangClientCodegen.java @@ -355,7 +355,7 @@ public class ErlangClientCodegen extends DefaultCodegen implements CodegenConfig String length(Object os) { int l = 1; for (CodegenParameter o : ((ExtendedCodegenOperation) os).allParams) { - CodegenParameter q = (CodegenParameter) o; + CodegenParameter q = o; if (q.required) l++; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java index 01b7293ab94..12547a5d763 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java @@ -708,8 +708,8 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF // NOTE: use double to hold float values, to avoid numeric overflow. double min = var == null || var.minimum == null ? -Float.MAX_VALUE : Float.parseFloat(var.minimum); double max = var == null || var.maximum == null ? Float.MAX_VALUE : Float.parseFloat(var.maximum); - double exclusiveMin = (double) (var != null && var.exclusiveMinimum ? 1 : 0); - double inclusiveMax = (double) (var == null || !var.exclusiveMaximum ? 1 : 0); + double exclusiveMin = var != null && var.exclusiveMinimum ? 1 : 0; + double inclusiveMax = var == null || !var.exclusiveMaximum ? 1 : 0; float randomFloat = (float) (min + exclusiveMin + ((max + inclusiveMax - min - exclusiveMin) * Math.random())); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java index edd71aeae55..5065de502c6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java @@ -71,7 +71,7 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig { if (obj == null || getClass() != obj.getClass()) return false; Parameter p = (Parameter) obj; - return key.equals(p.key) && value.equals((String) p.value); + return key.equals(p.key) && value.equals(p.value); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java index a21fe433bbf..3c013d9160c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KtormSchemaCodegen.java @@ -1152,7 +1152,7 @@ public class KtormSchemaCodegen extends AbstractKotlinCodegen { this.identifierNamingConvention = naming; break; default: - LOGGER.warn("\"" + (String) naming + "\" is invalid \"identifierNamingConvention\" argument. Current \"" + (String) this.identifierNamingConvention + "\" used instead."); + LOGGER.warn("\"" + naming + "\" is invalid \"identifierNamingConvention\" argument. Current \"" + this.identifierNamingConvention + "\" used instead."); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java index aa883ff9d91..f57a3ecb20f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/MysqlSchemaCodegen.java @@ -1196,7 +1196,7 @@ public class MysqlSchemaCodegen extends DefaultCodegen implements CodegenConfig this.identifierNamingConvention = naming; break; default: - LOGGER.warn("\"" + (String) naming + "\" is invalid \"identifierNamingConvention\" argument. Current \"" + (String) this.identifierNamingConvention + "\" used instead."); + LOGGER.warn("\"" + naming + "\" is invalid \"identifierNamingConvention\" argument. Current \"" + this.identifierNamingConvention + "\" used instead."); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java index 1c4a9e1295b..1ba15918ef4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlim4ServerCodegen.java @@ -147,7 +147,7 @@ public class PhpSlim4ServerCodegen extends PhpSlimServerCodegen { break; default: this.psr7Implementation = "slim-psr7"; - LOGGER.warn("\"" + (String) psr7Implementation + "\" is invalid \"psr7Implementation\" argument. Default \"slim-psr7\" used instead."); + LOGGER.warn("\"" + psr7Implementation + "\" is invalid \"psr7Implementation\" argument. Default \"slim-psr7\" used instead."); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java index a5967578311..d0106ead727 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift5ClientCodegen.java @@ -628,7 +628,7 @@ public class Swift5ClientCodegen extends DefaultCodegen implements CodegenConfig // Datetime time stamps in Swift are expressed as Seconds with Microsecond precision. // In Java, we need to be creative to get the Timestamp in Microseconds as a long. Instant instant = ((OffsetDateTime) p.getDefault()).toInstant(); - long epochMicro = TimeUnit.SECONDS.toMicros(instant.getEpochSecond()) + ((long) instant.get(ChronoField.MICRO_OF_SECOND)); + long epochMicro = TimeUnit.SECONDS.toMicros(instant.getEpochSecond()) + (instant.get(ChronoField.MICRO_OF_SECOND)); return "Date(timeIntervalSince1970: " + String.valueOf(epochMicro) + ".0 / 1_000_000)"; } else if (ModelUtils.isStringSchema(p)) { return "\"" + escapeText((String) p.getDefault()) + "\""; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/mysql/MysqlSchemaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/mysql/MysqlSchemaCodegenTest.java index f28e48e19cb..220a663d795 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/mysql/MysqlSchemaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/mysql/MysqlSchemaCodegenTest.java @@ -90,7 +90,7 @@ public class MysqlSchemaCodegenTest { Assert.assertFalse((Boolean) strProp.get("isFloat")); Assert.assertFalse((Boolean) strProp.get("isInteger")); Assert.assertFalse((Boolean) strProp.get("isNumeric")); - Assert.assertSame((String) strProp.get("argumentValue"), strArgument); + Assert.assertSame(strProp.get("argumentValue"), strArgument); Integer intArgument = 10; HashMap<String, Object> intProp = codegen.toCodegenMysqlDataTypeArgument(intArgument); @@ -98,7 +98,7 @@ public class MysqlSchemaCodegenTest { Assert.assertFalse((Boolean) intProp.get("isFloat")); Assert.assertTrue((Boolean) intProp.get("isInteger")); Assert.assertTrue((Boolean) intProp.get("isNumeric")); - Assert.assertSame((Integer) intProp.get("argumentValue"), intArgument); + Assert.assertSame(intProp.get("argumentValue"), intArgument); Double floatArgument = 3.14; HashMap<String, Object> floatProp = codegen.toCodegenMysqlDataTypeArgument(floatArgument); @@ -106,7 +106,7 @@ public class MysqlSchemaCodegenTest { Assert.assertTrue((Boolean) floatProp.get("isFloat")); Assert.assertFalse((Boolean) floatProp.get("isInteger")); Assert.assertTrue((Boolean) floatProp.get("isNumeric")); - Assert.assertSame((Double) floatProp.get("argumentValue"), floatArgument); + Assert.assertSame(floatProp.get("argumentValue"), floatArgument); } @Test -- GitLab