Skip to content

Commit a4d6d7b

Browse files
HugoMarioHugoMario
authored
Merge pull request #8225 from swagger-api/swagger-core-parser-dependencies-updates
updated swagger core and swagger parser versions, also added tests to…
2 parents faf1c93 + 1c0bc3f commit a4d6d7b

File tree

9 files changed

+48
-16
lines changed

9 files changed

+48
-16
lines changed

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2156,10 +2156,10 @@ public CodegenOperation fromOperation(String path,
21562156
op.responses.get(op.responses.size() - 1).hasMore = false;
21572157

21582158
if (methodResponse != null) {
2159-
if (methodResponse.getSchema() != null) {
2160-
CodegenProperty cm = fromProperty("response", methodResponse.getSchema());
2161-
2162-
Property responseProperty = methodResponse.getSchema();
2159+
final Property responseProperty = methodResponse.getSchema();
2160+
if (responseProperty != null) {
2161+
responseProperty.setRequired(true);
2162+
CodegenProperty cm = fromProperty("response", responseProperty);
21632163

21642164
if (responseProperty instanceof ArrayProperty) {
21652165
ArrayProperty ap = (ArrayProperty) responseProperty;

‎modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.swagger.codegen;
22

33
import io.swagger.models.Model;
4+
import io.swagger.models.ModelImpl;
45
import io.swagger.models.Operation;
56
import io.swagger.models.Swagger;
67
import io.swagger.models.properties.Property;
@@ -431,4 +432,12 @@ public void deprecatedParamTest() {
431432

432433
Assert.assertTrue(op.isDeprecated);
433434
}
435+
436+
@Test(description = "https://github.com/swagger-api/swagger-codegen/issues/7980")
437+
public void testPattern() throws Exception {
438+
final Swagger swagger = parseAndPrepareSwagger("src/test/resources/2_0/petstore.yaml");
439+
ModelImpl currency = (ModelImpl) swagger.getDefinitions().get("Currency");
440+
Assert.assertNotNull(currency);
441+
Assert.assertEquals(currency.getPattern(), "^[A-Z]{3,3}$");
442+
}
434443
}

‎modules/swagger-codegen/src/test/resources/2_0/petstore.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,29 @@ definitions:
702702
type: string
703703
message:
704704
type: string
705+
#issue: https://github.com/swagger-api/swagger-codegen/issues/7980
706+
Amount:
707+
type: object
708+
description: >
709+
some description
710+
properties:
711+
value:
712+
format: double
713+
type: number
714+
minimum: 0.01
715+
maximum: 1000000000000000
716+
description: >
717+
some description
718+
currency:
719+
$ref: '#/definitions/Currency'
720+
required:
721+
- value
722+
- currency
723+
Currency:
724+
type: string
725+
pattern: '^[A-Z]{3,3}$'
726+
description: >
727+
some description
705728
externalDocs:
706729
description: Find out more about Swagger
707730
url: 'http://swagger.io'

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -933,10 +933,10 @@
933933
</repository>
934934
</repositories>
935935
<properties>
936-
<swagger-parser-version>1.0.34</swagger-parser-version>
936+
<swagger-parser-version>1.0.36</swagger-parser-version>
937937
<scala-version>2.11.1</scala-version>
938938
<felix-version>3.3.0</felix-version>
939-
<swagger-core-version>1.5.18</swagger-core-version>
939+
<swagger-core-version>1.5.20</swagger-core-version>
940940
<commons-io-version>2.4</commons-io-version>
941941
<commons-cli-version>1.2</commons-cli-version>
942942
<junit-version>4.8.1</junit-version>

‎pom.xml.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -909,10 +909,10 @@
909909
</repository>
910910
</repositories>
911911
<properties>
912-
<swagger-parser-version>1.0.34</swagger-parser-version>
912+
<swagger-parser-version>1.0.36</swagger-parser-version>
913913
<scala-version>2.11.1</scala-version>
914914
<felix-version>3.3.0</felix-version>
915-
<swagger-core-version>1.5.18</swagger-core-version>
915+
<swagger-core-version>1.5.20</swagger-core-version>
916916
<commons-io-version>2.4</commons-io-version>
917917
<commons-cli-version>1.2</commons-cli-version>
918918
<junit-version>4.8.1</junit-version>

‎pom.xml.circleci

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -957,10 +957,10 @@
957957
</repository>
958958
</repositories>
959959
<properties>
960-
<swagger-parser-version>1.0.34</swagger-parser-version>
960+
<swagger-parser-version>1.0.36</swagger-parser-version>
961961
<scala-version>2.11.1</scala-version>
962962
<felix-version>3.3.0</felix-version>
963-
<swagger-core-version>1.5.18</swagger-core-version>
963+
<swagger-core-version>1.5.20</swagger-core-version>
964964
<commons-io-version>2.4</commons-io-version>
965965
<commons-cli-version>1.2</commons-cli-version>
966966
<junit-version>4.8.1</junit-version>

‎pom.xml.circleci.java7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -939,10 +939,10 @@
939939
</repository>
940940
</repositories>
941941
<properties>
942-
<swagger-parser-version>1.0.34</swagger-parser-version>
942+
<swagger-parser-version>1.0.36</swagger-parser-version>
943943
<scala-version>2.11.1</scala-version>
944944
<felix-version>3.3.0</felix-version>
945-
<swagger-core-version>1.5.18</swagger-core-version>
945+
<swagger-core-version>1.5.20</swagger-core-version>
946946
<commons-io-version>2.4</commons-io-version>
947947
<commons-cli-version>1.2</commons-cli-version>
948948
<junit-version>4.8.1</junit-version>

‎pom.xml.ios

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,10 +917,10 @@
917917
</repository>
918918
</repositories>
919919
<properties>
920-
<swagger-parser-version>1.0.34</swagger-parser-version>
920+
<swagger-parser-version>1.0.36</swagger-parser-version>
921921
<scala-version>2.11.1</scala-version>
922922
<felix-version>3.3.0</felix-version>
923-
<swagger-core-version>1.5.18</swagger-core-version>
923+
<swagger-core-version>1.5.20</swagger-core-version>
924924
<commons-io-version>2.4</commons-io-version>
925925
<commons-cli-version>1.2</commons-cli-version>
926926
<junit-version>4.8.1</junit-version>

‎pom.xml.shippable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -911,10 +911,10 @@
911911
</repository>
912912
</repositories>
913913
<properties>
914-
<swagger-parser-version>1.0.34</swagger-parser-version>
914+
<swagger-parser-version>1.0.36</swagger-parser-version>
915915
<scala-version>2.11.1</scala-version>
916916
<felix-version>3.3.0</felix-version>
917-
<swagger-core-version>1.5.18</swagger-core-version>
917+
<swagger-core-version>1.5.20</swagger-core-version>
918918
<commons-io-version>2.4</commons-io-version>
919919
<commons-cli-version>1.2</commons-cli-version>
920920
<junit-version>4.8.1</junit-version>

0 commit comments

Comments
 (0)