@team-supercharge/oasg 18.2.0 → 18.2.1-temp-feat-spring-boot-4.956dbdab

package/README.md

@@ -140,15 +140,15 @@ The table below gives an overview of the changes (breaking, non-breaking, bug fi
 | `dotnet-system-text-json`        |🆕➖|
 | `dotnet-webapi`                  |✨  |➖  |🆕➖|
 | `dotnet-webapi-system-text-json` |🆕➖|
-| `feign`                          |➖  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |🐛  |🆕  |
-| `feign-kotlin`                   |➖  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |🆕  |
-| `plain-java`                     |➖  |🐛  |🆕  |
+| `feign`                          |🐛  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |🐛  |🆕  |
+| `feign-kotlin`                   |🐛  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `plain-java`                     |🐛  |🐛  |🆕  |
 | `flutter`                        |➖  |➖  |➖  |➖  |➖  |🆕  |
 | `ios`                            |➖  |➖  |➖  |➖  |➖  |💥  |🐛  |➖  |➖  |➖  |✨  |➖  |💥  |➖  |➖  |✨  |🆕  |
 | `apple-swift`                    |➖  |➖  |🆕  |
 | `kmp`                            |✨  |✨  |➖  |➖  |🆕  |
-| `python`                         |➖  |➖  |🆕  |
-| `python-legacy`                  |➖  |➖  |💥  |➖  |🐛  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
+| `python`                         |🐛  |➖  |🆕  |
+| `python-legacy`                  |🐛  |➖  |💥  |➖  |🐛  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
 | `react`                          |💥  |➖  |🐛  |🐛  |➖  |💥  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
 | `typescript-axios`               |✨  |➖  |🆕  |
 | `typescript-fetch`               |✨  |➖  |🆕  |
@@ -156,8 +156,8 @@ The table below gives an overview of the changes (breaking, non-breaking, bug fi
 | `nestjs`                         |✨  |🐛  |💥  |💥  |➖  |💥  |✨  |➖  |➖  |🐛  |➖  |➖  |✨  |🆕  |
 | `python-fastapi`                 |➖  |➖  |➖  |➖  |🆕  |
 | `python-fastapi-raw-request`     |➖  |➖  |➖  |➖  |🆕  |
-| `spring`                         |➖  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |➖  |✨  |➖  |🆕  |
-| `spring-kotlin`                  |➖  |✨  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |✨  |➖  |🆕  |
+| `spring`                         |🐛  |🐛  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |➖  |✨  |➖  |🆕  |
+| `spring-kotlin`                  |🐛  |✨  |✨  |➖  |➖  |➖  |➖  |➖  |✨  |💥  |💥  |➖  |➖  |🐛  |✨  |➖  |🆕  |
 | **Misc Targets**                 | 18 | 17 | 16 | 15 | 14 | 13 | 12 | 11 | 10 | 9  | 8  | 7  | 6  | 5   | 4  | 3  | 2  | 1  |
 | `contract-testing`               |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |➖  |🆕  |
 | `openapi`                        |➖  |➖  |➖  |➖  |➖  |➖  |💥  |➖  |➖  |✨  |➖  |🆕  |
@@ -907,6 +907,7 @@ TBD
 |-|-|-|-|
 | packageName | Package nem for the project (convention: snake_case) | Y | - |
 | repositoryUrl | URL of the PyPI repository | Y | - |
+| projectName | Internal project name, inherits value of packageName (advised to keep the same) | N | $packageName |
 
 Publishing the PyPI packages is done with Twine. For authentication against the PiPI repository you need to set the `TWINE_USERNAME` and `TWINE_PASSWORD` environment variables.
 
@@ -926,6 +927,7 @@ Publishing the PyPI packages is done with Twine. For authentication against the
 |-|-|-|-|
 | packageName | Package nem for the project (convention: snake_case) | Y | - |
 | repositoryUrl | URL of the PyPI repository | Y | - |
+| projectName | Internal project name, inherits value of packageName (advised to keep the same) | N | $packageName |
 
 > ⚠️ Using Pydantic v1 for legacy reasons, this target will be discontinued.
 

package/bin/oasg

@@ -38,9 +38,9 @@ const DEFAULT_GENERATOR_MAPPING = {
   // client targets
   "android":                      { version: '7.17.0',  generator: 'kotlin' },
   "angular":                      { version: '7.11.0',  generator: 'typescript-angular' },
-  "feign":                        { version: '7.12.0',  generator: 'spring' },
-  "feign-kotlin":                 { version: '7.12.0',  generator: 'kotlin-spring' },
-  "plain-java":                   { version: '7.12.0',  generator: 'java' },
+  "feign":                        { version: '7.22.0',  generator: 'spring' },
+  "feign-kotlin":                 { version: '7.22.0',  generator: 'kotlin-spring' },
+  "plain-java":                   { version: '7.22.0',  generator: 'java' },
   "flutter":                      { version: '7.0.1',   generator: 'dart-dio' },
   "ios":                          { version: '7.0.1',   generator: 'swift5' },
   "apple-swift":                  { version: undefined, generator: undefined },
@@ -52,8 +52,8 @@ const DEFAULT_GENERATOR_MAPPING = {
   "typescript-fetch":             { version: '7.11.0',  generator: 'typescript-fetch' },
   // server targets
   "nestjs":                       { version: '7.0.1',   generator: 'typescript-angular' },
-  "spring":                       { version: '7.12.0',  generator: 'spring' },
-  "spring-kotlin":                { version: '7.12.0',  generator: 'kotlin-spring' },
+  "spring":                       { version: '7.22.0',  generator: 'spring' },
+  "spring-kotlin":                { version: '7.22.0',  generator: 'kotlin-spring' },
   "python-fastapi":               { version: '7.8.0',   generator: 'python-fastapi' },
   "python-fastapi-raw-request":   { version: '7.0.1',   generator: 'python-fastapi' },
   "dotnet":                       { version: '7.11.0',  generator: 'csharp-functions' },
@@ -741,4 +741,3 @@ function determineArtifactVersion(argv) {
 function determinePreRelease(argv) {
   return argv.preRelease ? true : false;
 }
-

package/config.schema.yml

@@ -344,6 +344,8 @@ targets:
             type: string
           repositoryUrl:
             type: string
+          projectName:
+            type: string
         required:
         - packageName
         - repositoryUrl
@@ -358,6 +360,8 @@ targets:
             type: string
           repositoryUrl:
             type: string
+          projectName:
+            type: string
         required:
         - packageName
         - repositoryUrl

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "18.2.0",
+  "version": "18.2.1-temp-feat-spring-boot-4.956dbdab",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",
@@ -48,6 +48,8 @@
     "@types/jest": "^29.5.12",
     "execa": "^5.0.0",
     "fs-extra": "^11.1.1",
-    "jest": "^29.5.0"
+    "jest": "^29.5.0",
+    "jest-html-reporter": "^4.4.0",
+    "jest-junit": "^17.0.0"
   }
 }

package/targets/feign/.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,4 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+wrapperVersion=3.3.4
+distributionType=bin
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar

package/targets/feign/generate.sh

@@ -5,13 +5,26 @@ source $(dirname "$0")/../common.sh
 rm -rf out/$targetId
 mkdir -p out/$targetId
 
+properties=(
+  "artifactId=${artifactId}"
+  "groupId=${groupId}"
+  "artifactVersion=${version}"
+  "basePackage=${basePackage}"
+  "apiPackage=${basePackage}.api"
+  "modelPackage=${basePackage}.model"
+  "configPackage=${basePackage}.config"
+)
+
+props=$(IFS=,; echo "${properties[*]}")
+
 java -jar $binary generate \
   -g $generatorId \
   -i $openApiFile \
   -t $templateDir \
   -o out/$targetId \
   -c $(dirname "$0")/generator-config.json \
-  -p "artifactId=${artifactId},groupId=${groupId},basePackage=${basePackage},apiPackage=${basePackage}.api,modelPackage=${basePackage}.model,invokerPackage=${basePackage}.client,artifactVersion=${version}" $generatorCustomArgs
+  -p "$props" \
+  $generatorCustomArgs
 
 cd out/$targetId
 cp $(dirname "$0")/mvnw .

package/targets/feign/generator-config.json

@@ -1,22 +1,18 @@
 {
   "library": "spring-cloud",
-  "dateLibrary": "java8",
-  "java8": true,
   "useTags": true,
   "hideGenerationTimestamp": true,
   "booleanGetterPrefix": "is",
-  "generateForOpenFeign": true,
-  "removeEnumValuePrefix": false,
   "documentationProvider": "none",
   "annotationLibrary": "none",
-  "useSpringBoot3": true,
+  "useSpringBoot3": false,
+  "useSpringBoot4": true,
+  "useJackson3": true,
   "typeMappings": {
-    "OffsetDateTime": "java.time.Instant",
-    "Date": "java.time.LocalDate"
+    "OffsetDateTime": "Instant"
   },
   "importMappings": {
-    "java.time.OffsetDateTime": "java.time.Instant",
-    "java.util.Date": "java.time.LocalDate"
+    "OffsetDateTime": "java.time.Instant"
   },
   "inlineSchemaOptions": {
     "ARRAY_ITEM_SUFFIX": "",