Skip to content

Commit 3d84bf9

Browse files
authored
Merge branch 'master' into #11852-fix-override-in-typescript
2 parents 7214bc6 + 435a478 commit 3d84bf9

File tree

25 files changed

+167
-97
lines changed

25 files changed

+167
-97
lines changed

.github/workflows/docker-release-3.0.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ jobs:
7272
docker tag $DOCKER_GENERATOR_ROOT_FULL_IMAGE_NAME:${{ env.TAG }} $DOCKER_GENERATOR_FULL_IMAGE_NAME:${{ env.TAG }}-root
7373
docker push $DOCKER_GENERATOR_FULL_IMAGE_NAME:$${{ env.TAG }}-root
7474
env:
75-
TAG: ${{ github.event.inputs.tag }}
75+
TAG: ${{ github.event.inputs.tag }}

.github/workflows/maven-master-pulls.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,20 @@ jobs:
2727
${{ runner.os }}-maven-
2828
- name: Build with Maven
2929
run: mvn -B -U verify --file pom.xml
30+
31+
scan-with-lacework:
32+
name: Trigger LaceWork Scanning
33+
runs-on: ubuntu-latest
34+
35+
needs: [ build ]
36+
if: success()
37+
38+
steps:
39+
- name: Trigger LaceWork Scanning using a different method
40+
run: |
41+
docker run -e LW_ACCOUNT_NAME=$LW_ACCOUNT_NAME -e LW_ACCESS_TOKEN=$LW_ACCESS_TOKEN -e LW_SCANNER_SAVE_RESULTS=true -e LW_SCANNER_DISABLE_UPDATES=false -v /var/run/docker.sock:/var/run/docker.sock lacework/lacework-inline-scanner:latest image evaluate swaggerapi/swagger-codegen-cli latest --docker-server index.docker.io --docker-username $docker_user --docker-password $docker_password > /dev/null 2>&1
42+
env:
43+
LW_ACCOUNT_NAME: ${{ secrets.LW_ACCOUNT_NAME }}
44+
LW_ACCESS_TOKEN: ${{ secrets.LW_ACCESS_TOKEN }}
45+
docker_user: ${{ secrets.DOCKERHUB_SB_USERNAME}}
46+
docker_password: ${{ secrets.DOCKERHUB_SB_PASSWORD}}

.github/workflows/maven-master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ jobs:
5656
docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME:unstable
5757
else
5858
echo "not deploying release nor building and pushing release docker image: " ${MY_POM_VERSION}
59-
fi
59+
fi

.github/workflows/test-framework-v2-ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
##### DYNAMIC: Dependent on build environment
117117
###############################################
118118
matrix:
119-
ruby: ['2.2']
119+
ruby: ['2.3']
120120
java: [ 8 ]
121121
###############################################
122122
##### END DYNAMIC: Dependent on build environment

.github/workflows/test-generation-v2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
##### DYNAMIC: Dependent on build environment
114114
###############################################
115115
matrix:
116-
ruby: ['2.2']
116+
ruby: ['2.3']
117117
java: [ 11 ]
118118
###############################################
119119
##### END DYNAMIC: Dependent on build environment

README.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
[![Build Status](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-master-java7/badge/icon?subject=jenkins%20build%20-%20java%207)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-master-java7/)
88

9-
- Master (2.4.33-SNAPSHOT): [![Java Test](https://img.shields.io/jenkins/build.svg?jobUrl=https://jenkins.swagger.io/job/oss-swagger-codegen-master)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-master)
9+
- Master (2.4.34-SNAPSHOT): [![Java Test](https://img.shields.io/jenkins/build.svg?jobUrl=https://jenkins.swagger.io/job/oss-swagger-codegen-master)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-master)
1010
[![Windows Test](https://ci.appveyor.com/api/projects/status/github/swagger-api/swagger-codegen?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/swaggerhub-bot/swagger-codegen)
1111

1212
- 3.0.44-SNAPSHOT: [![Java Test](https://img.shields.io/jenkins/build.svg?jobUrl=https://jenkins.swagger.io/job/oss-swagger-codegen-3)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-3)
@@ -50,7 +50,7 @@ dependency example:
5050
<dependency>
5151
<groupId>io.swagger</groupId>
5252
<artifactId>swagger-codegen-maven-plugin</artifactId>
53-
<version>2.4.32</version>
53+
<version>2.4.33</version>
5454
</dependency>
5555
```
5656

@@ -68,7 +68,7 @@ dependency example:
6868
<dependency>
6969
<groupId>io.swagger.codegen.v3</groupId>
7070
<artifactId>swagger-codegen-maven-plugin</artifactId>
71-
<version>3.0.43</version>
71+
<version>3.0.44</version>
7272
</dependency>
7373
```
7474

@@ -132,8 +132,9 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
132132

133133
Swagger Codegen Version | Release Date | OpenAPI Spec compatibility | Notes
134134
-------------------------- |--------------| -------------------------- | -----
135-
3.0.44-SNAPSHOT (current 3.0.0, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/codegen/v3/swagger-codegen-cli/3.0.44-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
136-
[3.0.43](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.43) (**current stable**) | 2023-05-17 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.43](https://github.com/swagger-api/swagger-codegen/tree/v3.0.43)
135+
3.0.45-SNAPSHOT (current 3.0.0, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/codegen/v3/swagger-codegen-cli/3.0.44-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
136+
[3.0.44](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.44) (**current stable**) | 2023-10-02 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.44](https://github.com/swagger-api/swagger-codegen/tree/v3.0.44)
137+
[3.0.43](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.43) | 2023-05-17 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.43](https://github.com/swagger-api/swagger-codegen/tree/v3.0.43)
137138
[3.0.42](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.42) | 2023-04-05 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.42](https://github.com/swagger-api/swagger-codegen/tree/v3.0.42)
138139
[3.0.41](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.41) | 2023-02-16 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.41](https://github.com/swagger-api/swagger-codegen/tree/v3.0.41)
139140
[3.0.40](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.40) | 2023-01-27 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.40](https://github.com/swagger-api/swagger-codegen/tree/v3.0.40)
@@ -176,8 +177,9 @@ Swagger Codegen Version | Release Date | OpenAPI Spec compatibility | Notes
176177
[3.0.2](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.2)| 2018-10-19 | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
177178
[3.0.1](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.1)| 2018-10-05 | 1.0, 1.1, 1.2, 2.0, 3.0 | Major release with breaking changes
178179
[3.0.0](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.0)| 2018-09-06 | 1.0, 1.1, 1.2, 2.0, 3.0 | Major release with breaking changes
179-
2.4.33-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.33-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0 | Minor release
180-
[2.4.32](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.32) (**current stable**) | 2023-05-17 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.32](https://github.com/swagger-api/swagger-codegen/tree/v2.4.32)
180+
2.4.34-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.34-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0 | Minor release
181+
[2.4.33](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.33) (**current stable**) | 2023-10-02 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.33](https://github.com/swagger-api/swagger-codegen/tree/v2.4.33)
182+
[2.4.32](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.32) | 2023-05-17 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.32](https://github.com/swagger-api/swagger-codegen/tree/v2.4.32)
181183
[2.4.31](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.31) | 2023-04-02 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.31](https://github.com/swagger-api/swagger-codegen/tree/v2.4.31)
182184
[2.4.30](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.30) | 2023-02-16 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.30](https://github.com/swagger-api/swagger-codegen/tree/v2.4.30)
183185
[2.4.29](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.29) | 2022-11-10 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.29](https://github.com/swagger-api/swagger-codegen/tree/v2.4.29)
@@ -223,17 +225,17 @@ If you're looking for the latest stable version, you can grab it directly from M
223225

224226
```sh
225227
# Download current stable 2.x.x branch (Swagger and OpenAPI version 2)
226-
wget https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.32/swagger-codegen-cli-2.4.32.jar -O swagger-codegen-cli.jar
228+
wget https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.33/swagger-codegen-cli-2.4.33.jar -O swagger-codegen-cli.jar
227229

228230
java -jar swagger-codegen-cli.jar help
229231

230232
# Download current stable 3.x.x branch (OpenAPI version 3)
231-
wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.43/swagger-codegen-cli-3.0.43.jar -O swagger-codegen-cli.jar
233+
wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.44/swagger-codegen-cli-3.0.44.jar -O swagger-codegen-cli.jar
232234

233235
java -jar swagger-codegen-cli.jar --help
234236
```
235237

236-
For Windows users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g. `Invoke-WebRequest -OutFile swagger-codegen-cli.jar https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.32/swagger-codegen-cli-2.4.32.jar`
238+
For Windows users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g. `Invoke-WebRequest -OutFile swagger-codegen-cli.jar https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.33/swagger-codegen-cli-2.4.33.jar`
237239

238240
On a mac, it's even easier with `brew`:
239241
```sh
@@ -381,7 +383,7 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
381383
```
382384
(if you're on Windows, replace the last command with `java -jar modules\swagger-codegen-cli\target\swagger-codegen-cli.jar generate -i https://petstore.swagger.io/v2/swagger.json -l php -o c:\temp\php_api_client`)
383385

384-
You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.32/swagger-codegen-cli-2.4.32.jar)
386+
You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.33/swagger-codegen-cli-2.4.33.jar)
385387

386388
To get a list of **general** options available, please run `java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar help generate` (for version 3.x check [3.0.0 branch](https://github.com/swagger-api/swagger-codegen/tree/3.0.0))
387389

modules/swagger-codegen-cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.swagger</groupId>
55
<artifactId>swagger-codegen-project</artifactId>
6-
<version>2.4.33-SNAPSHOT</version>
6+
<version>2.4.33</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

modules/swagger-codegen-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.swagger</groupId>
66
<artifactId>swagger-codegen-project</artifactId>
7-
<version>2.4.33-SNAPSHOT</version>
7+
<version>2.4.33</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<artifactId>swagger-codegen-maven-plugin</artifactId>

modules/swagger-codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.swagger</groupId>
55
<artifactId>swagger-codegen-project</artifactId>
6-
<version>2.4.33-SNAPSHOT</version>
6+
<version>2.4.33</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractGoCodegen.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -486,13 +486,10 @@ public String toEnumVarName(String name, String datatype) {
486486
if ("int".equals(datatype) || "int32".equals(datatype) || "int64".equals(datatype)
487487
|| "uint".equals(datatype) || "uint32".equals(datatype) || "uint64".equals(datatype)
488488
|| "float".equals(datatype) || "float32".equals(datatype) || "float64".equals(datatype)) {
489-
String varName = name;
489+
String varName = "NUMBER_" + name;
490490
varName = varName.replaceAll("-", "MINUS_");
491491
varName = varName.replaceAll("\\+", "PLUS_");
492492
varName = varName.replaceAll("\\.", "_DOT_");
493-
if (varName.matches("\\d.*")) {
494-
return "_" + varName;
495-
}
496493
return varName;
497494
}
498495

@@ -506,7 +503,13 @@ public String toEnumVarName(String name, String datatype) {
506503
enumName = enumName.replaceFirst("^_", "");
507504
enumName = enumName.replaceFirst("_$", "");
508505

509-
if (isReservedWord(enumName) || enumName.matches("\\d.*")) { // reserved word or starts with number
506+
// starts with a number
507+
if (enumName.matches("\\d.*")) {
508+
enumName = "_" + enumName;
509+
}
510+
511+
// reserved word
512+
if (isReservedWord(enumName)) {
510513
return escapeReservedWord(enumName);
511514
} else {
512515
return enumName;

0 commit comments

Comments
 (0)