From 94aee2176716298195642e98f31f43560c735ae3 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Tue, 1 Jan 2019 10:37:40 +0900 Subject: [PATCH 1/4] Delete unnecessary "throws" --- .../codegen/InlineModelResolverTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java index f87645b39bb6..b9c8f847a83f 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java @@ -35,7 +35,7 @@ @SuppressWarnings("static-method") public class InlineModelResolverTest { @Test - public void resolveInlineModelTestWithoutTitle() throws Exception { + public void resolveInlineModelTestWithoutTitle() { OpenAPI openapi = new OpenAPI(); openapi.setComponents(new Components()); openapi.getComponents().addSchemas("User", new ObjectSchema() @@ -70,7 +70,7 @@ public void resolveInlineModelTestWithoutTitle() throws Exception { } @Test - public void resolveInlineModelTestWithTitle() throws Exception { + public void resolveInlineModelTestWithTitle() { OpenAPI openapi = new OpenAPI(); openapi.setComponents(new Components()); openapi.getComponents().addSchemas("User", new ObjectSchema() @@ -99,7 +99,7 @@ public void resolveInlineModelTestWithTitle() throws Exception { } @Test - public void resolveInlineModel2EqualInnerModels() throws Exception { + public void resolveInlineModel2EqualInnerModels() { OpenAPI openapi = new OpenAPI(); openapi.setComponents(new Components()); openapi.getComponents().addSchemas("User", new ObjectSchema() @@ -143,7 +143,7 @@ public void resolveInlineModel2EqualInnerModels() throws Exception { } @Test - public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() throws Exception { + public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() { OpenAPI openapi = new OpenAPI(); openapi.setComponents(new Components()); openapi.getComponents().addSchemas("User", new ObjectSchema() @@ -191,7 +191,7 @@ public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() throws Except } @Test - public void testInlineResponseModel() throws Exception { + public void testInlineResponseModel() { OpenAPI openapi = new OpenAPI(); openapi.setComponents(new Components()); @@ -233,7 +233,7 @@ public void testInlineResponseModel() throws Exception { } @Test - public void testInlineResponseModelWithTitle() throws Exception { + public void testInlineResponseModelWithTitle() { OpenAPI openapi = new OpenAPI(); openapi.setComponents(new Components()); From b3f002b261f08ce0fd935364dbb645391a96e39b Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Tue, 1 Jan 2019 10:41:27 +0900 Subject: [PATCH 2/4] Delete unnecessary cast expressions --- .../codegen/InlineModelResolverTest.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java index b9c8f847a83f..f6d49a46d429 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java @@ -52,18 +52,18 @@ public void resolveInlineModelTestWithoutTitle() { .addProperties("street", new StringSchema()) .addProperties("city", new StringSchema()))); - assertNotNull(((Schema) openapi.getComponents().getSchemas().get("User")).getProperties().get("address")); + assertNotNull((openapi.getComponents().getSchemas().get("User")).getProperties().get("address")); new InlineModelResolver().flatten(openapi); - Schema user = (Schema) openapi.getComponents().getSchemas().get("User"); + Schema user = openapi.getComponents().getSchemas().get("User"); assertNotNull(user); assertNotNull(user.getProperties().get("address")); assertNotNull(((Schema) user.getProperties().get("address")).get$ref()); assertEquals(((Schema) user.getProperties().get("address")).get$ref(), "#/components/schemas/User_address"); - Schema address = (Schema) openapi.getComponents().getSchemas().get("User_address"); + Schema address = openapi.getComponents().getSchemas().get("User_address"); assertNotNull(address); assertNotNull(address.getProperties().get("city")); assertNotNull(address.getProperties().get("street")); @@ -87,12 +87,12 @@ public void resolveInlineModelTestWithTitle() { new InlineModelResolver().flatten(openapi); - Schema user = (Schema) openapi.getComponents().getSchemas().get("User"); + Schema user = openapi.getComponents().getSchemas().get("User"); assertNotNull(user); assertTrue(user.getProperties().get("address") instanceof Schema); - Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle"); + Schema address = openapi.getComponents().getSchemas().get("UserAddressTitle"); assertNotNull(address); assertNotNull(address.getProperties().get("city")); assertNotNull(address.getProperties().get("street")); @@ -134,11 +134,11 @@ public void resolveInlineModel2EqualInnerModels() { assertNotNull(user); assertTrue(user.getProperties().get("address") instanceof Schema); - Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle"); + Schema address = openapi.getComponents().getSchemas().get("UserAddressTitle"); assertNotNull(address); assertNotNull(address.getProperties().get("city")); assertNotNull(address.getProperties().get("street")); - Schema duplicateAddress = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle_0"); + Schema duplicateAddress = openapi.getComponents().getSchemas().get("UserAddressTitle_0"); assertNull(duplicateAddress); } @@ -174,16 +174,16 @@ public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() { new InlineModelResolver().flatten(openapi); - Schema user = (Schema) openapi.getComponents().getSchemas().get("User"); + Schema user = openapi.getComponents().getSchemas().get("User"); assertNotNull(user); assertTrue(user.getProperties().get("address") instanceof Schema); - Schema address = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle"); + Schema address = openapi.getComponents().getSchemas().get("UserAddressTitle"); assertNotNull(address); assertNotNull(address.getProperties().get("city")); assertNotNull(address.getProperties().get("street")); - Schema duplicateAddress = (Schema) openapi.getComponents().getSchemas().get("UserAddressTitle_1"); + Schema duplicateAddress = openapi.getComponents().getSchemas().get("UserAddressTitle_1"); assertNotNull(duplicateAddress); assertNotNull(duplicateAddress.getProperties().get("city")); assertNotNull(duplicateAddress.getProperties().get("street")); @@ -226,7 +226,7 @@ public void testInlineResponseModel() { assertEquals(1, schema.getExtensions().size()); assertEquals("ext-prop", schema.getExtensions().get("x-ext")); - Schema model = (Schema) openapi.getComponents().getSchemas().get("inline_response_200"); + Schema model = openapi.getComponents().getSchemas().get("inline_response_200"); assertTrue(model.getProperties().size() == 1); assertNotNull(model.getProperties().get("name")); assertTrue(model.getProperties().get("name") instanceof StringSchema); @@ -268,7 +268,7 @@ public void testInlineResponseModelWithTitle() { assertEquals(1, schema.getExtensions().size()); assertEquals("ext-prop", schema.getExtensions().get("x-ext")); - Schema model = (Schema) openapi.getComponents().getSchemas().get("GetBarResponse"); + Schema model = openapi.getComponents().getSchemas().get("GetBarResponse"); assertTrue(model.getProperties().size() == 1); assertNotNull(model.getProperties().get("name")); assertTrue(model.getProperties().get("name") instanceof StringSchema); From 9ab507ab5323b38556bc5d97ba124989afc2c653 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Tue, 1 Jan 2019 10:49:54 +0900 Subject: [PATCH 3/4] Tweak redundant assertions --- .../openapitools/codegen/InlineModelResolverTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java index f6d49a46d429..d0a0fc40e093 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java @@ -132,7 +132,7 @@ public void resolveInlineModel2EqualInnerModels() { ObjectSchema user = (ObjectSchema) openapi.getComponents().getSchemas().get("User"); assertNotNull(user); - assertTrue(user.getProperties().get("address") instanceof Schema); + assertNotNull(user.getProperties().get("address")); Schema address = openapi.getComponents().getSchemas().get("UserAddressTitle"); assertNotNull(address); @@ -222,12 +222,12 @@ public void testInlineResponseModel() { ApiResponse response = responses.get("200"); assertNotNull(response); Schema schema = response.getContent().get("application/json").getSchema(); - assertTrue(schema instanceof Schema); + assertNotNull(schema); assertEquals(1, schema.getExtensions().size()); assertEquals("ext-prop", schema.getExtensions().get("x-ext")); Schema model = openapi.getComponents().getSchemas().get("inline_response_200"); - assertTrue(model.getProperties().size() == 1); + assertEquals(1, model.getProperties().size()); assertNotNull(model.getProperties().get("name")); assertTrue(model.getProperties().get("name") instanceof StringSchema); } @@ -264,12 +264,12 @@ public void testInlineResponseModelWithTitle() { ApiResponse response = responses.get("200"); assertNotNull(response); Schema schema = response.getContent().get("application/json").getSchema(); - assertTrue(schema instanceof Schema); + assertNotNull(schema); assertEquals(1, schema.getExtensions().size()); assertEquals("ext-prop", schema.getExtensions().get("x-ext")); Schema model = openapi.getComponents().getSchemas().get("GetBarResponse"); - assertTrue(model.getProperties().size() == 1); + assertEquals(1, model.getProperties().size()); assertNotNull(model.getProperties().get("name")); assertTrue(model.getProperties().get("name") instanceof StringSchema); } From 3ef4284af9a02eb3656cacdb9c32e29051b0b617 Mon Sep 17 00:00:00 2001 From: "akihito.nakano" Date: Tue, 1 Jan 2019 10:51:05 +0900 Subject: [PATCH 4/4] Delete unnecessary comment --- .../java/org/openapitools/codegen/InlineModelResolverTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java index d0a0fc40e093..2735f15cb9de 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java @@ -44,8 +44,6 @@ public void resolveInlineModelTestWithoutTitle() { .addProperties("name", new StringSchema()) .addProperties("address", new ObjectSchema() .description("description") - //._default("default") - //.access("access") .readOnly(false) .description("description") .name("name")