npm - @team-supercharge/oasg - Versions diffs - 13.0.0-angular-16-730fa73f.0 → 13.0.0-java-upgrade-1d8b5fad.0 - Mend

@team-supercharge/oasg 13.0.0-angular-16-730fa73f.0 → 13.0.0-java-upgrade-1d8b5fad.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

package/README.md CHANGED Viewed

@@ -481,8 +481,7 @@ Common target parameters
   "type": "stubby",
   "source": "source-merged",
   "generateWithDocker": "true",
-  "repository": "registry.supercharge.io/misc/oasg-example",
-  "generator": "https://gitlab.supercharge.io/misc/openapi-generator-sc/-/package_files/225/download"
+  "repository": "registry.supercharge.io/misc/oasg-example"
 }
 ```
@@ -606,7 +605,6 @@ TBD
   "generatorId": "swift5",
   "source": "source-merged",
   "projectName": "OASgExample",
-  "generator": "https://gitlab.supercharge.io/misc/openapi-generator-sc/-/package_files/348/download",
   "repository": "git@gitlab.supercharge.io:example/openapi-generator-source.git",
   "interfaceType": "Combine",
   "generatorCustomArgs": "--model-name-suffix=ApiModel"
@@ -620,6 +618,25 @@ TBD
 | interfaceType | Response type of the generated client: `Combine` / `Result` / `RxSwift` / `AsyncAwait` / `PromiseKit` | Y | - |
 | generatorCustomArgs | Custom arguments of the generator | N | - |
+#### `flutter`
+```json
+{
+  "id": "client-flutter",
+  "type": "flutter",
+  "source": "source-merged",
+  "packageName": "OASgExample",
+  "repository": "git@gitlab.supercharge.io:example/openapi-generator-source.git",
+  "generatorCustomArgs": "--model-name-suffix=ApiModel"
+}
+```
+|Parameter| Description| Required | Default |
+|-|-|-|-|
+| packageName | Name of the package | Y | - |
+| repository | URL of the generated client api code repository | Y | - |
+| generatorCustomArgs | Custom arguments of the generator | N | - |
 #### `python`
 ```json
@@ -762,15 +779,18 @@ This section covers the breaking changes and their migrations across major versi
 ## From `12.x.x` to `13.0.0`
-### Schema naming updates in `angular` target
+### Schema naming updates in `angular`, `python`, `ios` targets
 With the update to [OpenAPI Generator 7.0.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.0.0) the same breaking changes appear as in other targets before:
-* `ARRAY_ITEM_SUFFIX` and `MAP_ITEM_SUFFIX` variables has been set to empty strings
-  - generated inline classes won't have the default `...Inner` suffix from now on
 * [Inline Schema Naming in `spring-kotlin`, `spring` and `feign`](#inline-schema-naming-in-spring-kotlin-spring-and-feign)
 * [Skip Reusing Schemas in `spring-kotlin`, `spring` and `feign`](#skip-reusing-schemas-in-spring-kotlin-spring-and-feign)
+and more:
+* `ARRAY_ITEM_SUFFIX` and `MAP_ITEM_SUFFIX` variables has been set to empty strings
+  - generated inline classes won't have the default `...Inner` suffix from now on
 ### Breaking in `angular` target
 * the default `ngVersion` parameter is set to `16.0.0` if you wish to specify another version, use e.g `"generatorCustomArgs": "-p ngVersion=12"` in your `config.json`

package/bin/oasg CHANGED Viewed

@@ -35,15 +35,16 @@ const DEFAULT_GENERATOR_MAPPING = {
   // client targets
   "android":          { version: '6.6.0',   generator: 'kotlin' },
   "angular":          { version: '7.0.0',   generator: 'typescript-angular' },
-  "feign":            { version: '6.6.0',   generator: 'spring' },
-  "feign-kotlin":     { version: '6.6.0',   generator: 'kotlin-spring' },
-  "ios":              { version: '4.3.1',   generator: 'swift5' },
-  "python":           { version: '6.6.0',   generator: 'python-nextgen' },
+  "feign":            { version: '7.0.0',   generator: 'spring' },
+  "feign-kotlin":     { version: '7.0.0',   generator: 'kotlin-spring' },
+  "flutter":          { version: '7.0.0',   generator: 'dart-dio' },
+  "ios":              { version: '7.0.0',   generator: 'swift5' },
+  "python":           { version: '7.0.0',   generator: 'python' },
   "react-native":     { version: '4.3.1',   generator: 'typescript-fetch' },
   // server targets
   "nestjs":           { version: '5.4.0',   generator: 'typescript-angular' },
-  "spring":           { version: '6.6.0',   generator: 'spring' },
-  "spring-kotlin":    { version: '6.6.0',   generator: 'kotlin-spring' },
+  "spring":           { version: '7.0.0',   generator: 'spring' },
+  "spring-kotlin":    { version: '7.0.0',   generator: 'kotlin-spring' },
   // misc targets
   "contract-testing": { version: '4.3.1',   generator: 'typescript-node' },
   "openapi":          { version: undefined, generator: undefined },

package/config.schema.yml CHANGED Viewed

@@ -23,6 +23,7 @@ properties:
         - $ref: '#/targets/ContractTesting'
         - $ref: '#/targets/NestJS'
         - $ref: '#/targets/OpenAPI'
+        - $ref: '#/targets/Flutter'
 required:
   - targets
 additionalProperties: false
@@ -331,6 +332,20 @@ targets:
           fileName:
             type: string
+  Flutter:
+    allOf:
+      - $ref: '#/targets/Base'
+      - properties:
+          type:
+            pattern: "^flutter$"
+          packageName:
+            type: string
+          repository:
+            type: string
+        required:
+        - packageName
+        - repository
 definitions:
   # default
   SourceOverrides:

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@team-supercharge/oasg",
-  "version": "13.0.0-angular-16-730fa73f.0",
+  "version": "13.0.0-java-upgrade-1d8b5fad.0",
   "description": "Node-based tool to lint OpenAPI documents and generate clients, servers and documentation from them",
   "author": "Supercharge",
   "license": "MIT",

package/targets/feign/generator-config.json CHANGED Viewed

@@ -17,9 +17,9 @@
     "java.time.OffsetDateTime": "java.time.Instant",
     "java.util.Date": "java.time.LocalDate"
   },
-  "inlineSchemaNameDefaults": {
-    "arrayItemSuffix": "",
-    "mapItemSuffix": "",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
     "SKIP_SCHEMA_REUSE": "true"
   }
 }

package/targets/feign/templates/beanValidation.mustache CHANGED Viewed

@@ -1,7 +1,2 @@
-{{! https://github.com/OpenAPITools/openapi-generator/pull/5960 }}
-{{#required}}{{^isReadOnly}}{{^isNullable}}
-    @NotNull{{/isNullable}}{{/isReadOnly}}
-{{/required}}{{#isContainer}}{{^isPrimitiveType}}{{^isEnum}}
-    @Valid{{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}
-    @Valid{{/isPrimitiveType}}{{/isContainer}}
-{{>beanValidationCore}}
+{{! only add @NotNull if property not nullable }}
+{{#required}}{{^isReadOnly}}{{^isNullable}}@NotNull {{/isNullable}}{{/isReadOnly}}{{/required}}{{#isContainer}}{{^isPrimitiveType}}{{^isEnum}}@Valid {{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{^isContainer}}{{^isPrimitiveType}}@Valid {{/isPrimitiveType}}{{/isContainer}}{{>beanValidationCore}}

package/targets/feign/templates/formParams.mustache CHANGED Viewed

@@ -1,2 +1,3 @@
-{{! https://github.com/OpenAPITools/openapi-generator/issues/7794 }}
+{{! annotate RequestPart instead of RequestParam when model is not array }}
+{{! add bean validation conditinally if param is file }}
 {{#isFormParam}}{{^isFile}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{/useBeanValidation}} {{#isModel}}@RequestPart{{/isModel}}{{^isModel}}{{#isArray}}@RequestPart{{/isArray}}{{^isArray}}@RequestPart{{/isArray}}{{/isModel}}(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}){{>dateTimeParam}} {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}{{>paramDoc}}{{#useBeanValidation}} @Valid{{/useBeanValidation}} @RequestPart(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{#isArray}}List<{{/isArray}}{{#reactive}}Flux<Part>{{/reactive}}{{^reactive}}MultipartFile{{/reactive}}{{#isArray}}>{{/isArray}} {{paramName}}{{/isFile}}{{/isFormParam}}

package/targets/feign/templates/libraries/spring-cloud/clientConfiguration.mustache ADDED Viewed

@@ -0,0 +1,118 @@
+{{! import ConditionalOnProperty if any auth methods are anbled }}
+package {{configPackage}};
+{{#authMethods}}
+{{#isBasicBasic}}
+import feign.auth.BasicAuthRequestInterceptor;
+{{^hasApiKeyMethods}}
+import org.springframework.beans.factory.annotation.Value;
+{{/hasApiKeyMethods}}
+{{/isBasicBasic}}
+{{/authMethods}}
+{{#hasAuthMethods}}
+import org.springframework.context.annotation.Bean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+{{#hasApiKeyMethods}}
+import org.springframework.beans.factory.annotation.Value;
+{{/hasApiKeyMethods}}
+{{#hasOAuthMethods}}
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.oauth2.client.AuthorizedClientServiceOAuth2AuthorizedClientManager;
+import org.springframework.security.oauth2.client.OAuth2AuthorizeRequest;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
+import org.springframework.security.oauth2.core.OAuth2AccessToken;
+import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.http.HttpHeaders;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+{{/hasOAuthMethods}}
+{{/hasAuthMethods}}
+import org.springframework.context.annotation.Configuration;
+@Configuration
+public class ClientConfiguration {
+{{#authMethods}}
+    {{#isBasicBasic}}
+  @Value("${{openbrace}}{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.username:{{closebrace}}")
+  private String {{{name}}}Username;
+  @Value("${{openbrace}}{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.password:{{closebrace}}")
+  private String {{{name}}}Password;
+  @Bean
+  @ConditionalOnProperty(name = "{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.username")
+  public BasicAuthRequestInterceptor {{{name}}}RequestInterceptor() {
+    return new BasicAuthRequestInterceptor(this.{{{name}}}Username, this.{{{name}}}Password);
+  }
+    {{/isBasicBasic}}
+    {{#isApiKey}}
+  @Value("${{openbrace}}{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.key:{{closebrace}}")
+  private String {{{name}}}Key;
+  @Bean
+  @ConditionalOnProperty(name = "{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.key")
+  public ApiKeyRequestInterceptor {{{name}}}RequestInterceptor() {
+    return new ApiKeyRequestInterceptor({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{{keyParamName}}}", this.{{{name}}}Key);
+  }
+    {{/isApiKey}}
+    {{#isOAuth}}
+  private static final String CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}} = "oauth2FeignClient";
+  @Bean
+  @ConditionalOnProperty( prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = "enabled", havingValue = "true" )
+  public OAuth2RequestInterceptor {{{flow}}}OAuth2RequestInterceptor(final OAuth2AuthorizedClientManager {{{flow}}}AuthorizedClientManager ) {
+     return new OAuth2RequestInterceptor(OAuth2AuthorizeRequest.withClientRegistrationId("{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}")
+            .principal( new AnonymousAuthenticationToken( CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}}, CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}}, AuthorityUtils.createAuthorityList( "ROLE_ANONYMOUS" ) ) )
+            .build(), {{{flow}}}AuthorizedClientManager );
+  }
+  @Bean
+  @ConditionalOnProperty( prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = "enabled", havingValue = "true" )
+  public OAuth2AuthorizedClientManager {{{flow}}}AuthorizedClientManager(ClientRegistrationRepository clientRegistrationRepository,
+        OAuth2AuthorizedClientService authorizedClientService ) {
+    return new AuthorizedClientServiceOAuth2AuthorizedClientManager( clientRegistrationRepository, authorizedClientService );
+  }
+    {{/isOAuth}}
+{{/authMethods}}
+{{#hasOAuthMethods}}
+  public static class OAuth2RequestInterceptor implements RequestInterceptor {
+    private final OAuth2AuthorizedClientManager oAuth2AuthorizedClientManager;
+    private final OAuth2AuthorizeRequest oAuth2AuthorizeRequest;
+    public OAuth2RequestInterceptor(OAuth2AuthorizeRequest oAuth2AuthorizeRequest,OAuth2AuthorizedClientManager oAuth2AuthorizedClientManager){
+      this.oAuth2AuthorizeRequest = oAuth2AuthorizeRequest;
+      this.oAuth2AuthorizedClientManager = oAuth2AuthorizedClientManager;
+    }
+    @Override
+    public void apply( final RequestTemplate template ) {
+      template.header( HttpHeaders.AUTHORIZATION, getBearerToken() );
+    }
+    public OAuth2AccessToken getAccessToken() {
+      final OAuth2AuthorizedClient authorizedClient = oAuth2AuthorizedClientManager.authorize(oAuth2AuthorizeRequest);
+      if (authorizedClient == null) {
+        throw new OAuth2AuthenticationException( "Client failed to authenticate");
+      }
+     return authorizedClient.getAccessToken();
+    }
+    public String getBearerToken() {
+      final OAuth2AccessToken accessToken = getAccessToken();
+      return String.format( "%s %s", accessToken.getTokenType().getValue(), accessToken.getTokenValue() );
+    }
+  }
+{{/hasOAuthMethods}}
+}

package/targets/feign/templates/libraries/spring-cloud/pom-sb3.mustache CHANGED Viewed

@@ -16,7 +16,7 @@
         {{/springDocDocumentationProvider}}
         {{^springDocDocumentationProvider}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations.version>}2.2.7</swagger-annotations.version>
+        <swagger-annotations.version>2.2.7</swagger-annotations.version>
         {{/swagger2AnnotationLibrary}}
         {{/springDocDocumentationProvider}}
     </properties>
@@ -47,18 +47,18 @@
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
         <plugins>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-                <execution>
-                    <id>attach-sources</id>
-                    <goals>
-                        <goal>jar</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
@@ -107,10 +107,10 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-client</artifactId>
             {{^parentOverridden}}
-            <version>2.2.5.RELEASE</version>
+            <version>6.1.1</version>
             {{/parentOverridden}}
         </dependency>
         {{#withXml}}

package/targets/feign/templates/libraries/spring-cloud/pom.mustache CHANGED Viewed

@@ -23,7 +23,7 @@
         <swagger-annotations.version>1.6.6</swagger-annotations.version>
         {{/swagger1AnnotationLibrary}}
         {{#swagger2AnnotationLibrary}}
-        <swagger-annotations.version>}2.2.7</swagger-annotations.version>
+        <swagger-annotations.version>2.2.7</swagger-annotations.version>
         {{/swagger2AnnotationLibrary}}
         {{/springDocDocumentationProvider}}
         {{/springFoxDocumentationProvider}}
@@ -46,18 +46,18 @@
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>
         <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-source-plugin</artifactId>
-              <executions>
-                  <execution>
-                      <id>attach-sources</id>
-                      <goals>
-                          <goal>jar</goal>
-                      </goals>
-                  </execution>
-              </executions>
-          </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
@@ -123,10 +123,10 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-client</artifactId>
             {{^parentOverridden}}
-            <version>2.2.5.RELEASE</version>
+            <version>5.7.8</version>
             {{/parentOverridden}}
         </dependency>
         {{#withXml}}

package/targets/feign-kotlin/generator-config.json CHANGED Viewed

@@ -18,9 +18,9 @@
     "java.time.OffsetDateTime": "java.time.Instant",
     "java.util.Date": "java.time.LocalDate"
   },
-  "inlineSchemaNameDefaults": {
-    "arrayItemSuffix": "",
-    "mapItemSuffix": "",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
     "SKIP_SCHEMA_REUSE": "true"
   }
 }

package/targets/feign-kotlin/templates/libraries/spring-cloud/pom-sb3.mustache CHANGED Viewed

@@ -1,5 +1,6 @@
 {{! attach sources }}
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>{{groupId}}</groupId>
     <artifactId>{{artifactId}}</artifactId>

package/targets/flutter/generate.sh ADDED Viewed

@@ -0,0 +1,22 @@
+#/bin/bash
+source $(dirname "$0")/../common.sh
+rm -rf out/$targetId
+mkdir -p out/$targetId
+java -jar $binary generate \
+  -g $generatorId \
+  -i $openApiFile \
+  -t $templateDir \
+  -o out/$targetId \
+  -c $(dirname "$0")/generator-config.json \
+  -ppubLibrary=$packageName \
+  -ppubName=$packageName \
+  -ppubRepository=$repository \
+  -ppubVersion=$version $generatorCustomArgs
+cd out/$targetId
+dart pub get
+dart run build_runner build
+cd ..

package/targets/flutter/generator-config.json ADDED Viewed

@@ -0,0 +1,8 @@
+{
+  "serializationLibrary": "json_serializable",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
+  }
+}

package/targets/flutter/publish.sh ADDED Viewed

@@ -0,0 +1,26 @@
+#/bin/bash
+source $(dirname "$0")/../common.sh
+cd out
+git clone $repository generator-source
+rm -rf generator-source/$packageName
+cp -rf $targetId/* generator-source
+cd generator-source
+if [ $(git status --porcelain | wc -l) -eq "0" ]; then
+  echo "🟢 No changes"
+else
+  git add .
+  git commit -m "chore(release): $version"
+  if [ "$preRelease" == "false" ]; then git push; fi
+  tagVersion="v$version"
+  git tag -f $tagVersion
+  git push origin -f --tags
+fi
+cd ..
+rm -rf generator-source
+cd ../..

package/targets/ios/generate.sh CHANGED Viewed

@@ -10,5 +10,6 @@ java -jar $binary generate \
   -i $openApiFile \
   -t $templateDir \
   -o out/$targetId \
+  -c $(dirname "$0")/generator-config.json \
   -pprojectName=$projectName \
   -presponseAs=$interfaceType $generatorCustomArgs

package/targets/ios/generator-config.json ADDED Viewed

@@ -0,0 +1,7 @@
+{
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
+  }
+}

package/targets/ios/publish.sh CHANGED Viewed

@@ -14,7 +14,7 @@ else
   git add .
   git commit -m "chore(release): $version"
-  if [ "$preRelease" == "false" ]; then git push origin master; fi
+  if [ "$preRelease" == "false" ]; then git push; fi
   tagVersion="v$version"
   git tag -f $tagVersion

package/targets/python/generator-config.json CHANGED Viewed

@@ -1,3 +1,8 @@
 {
-  "library": "urllib3"
+  "library": "urllib3",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
+    "SKIP_SCHEMA_REUSE": "true"
+  }
 }

package/targets/spring/generator-config.json CHANGED Viewed

@@ -18,9 +18,9 @@
   "importMappings": {
     "java.time.OffsetDateTime": "java.time.Instant"
   },
-  "inlineSchemaNameDefaults": {
-    "arrayItemSuffix": "",
-    "mapItemSuffix": "",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
     "SKIP_SCHEMA_REUSE": "true"
   }
 }

package/targets/spring/templates/libraries/spring-boot/pom-sb3.mustache ADDED Viewed

@@ -0,0 +1,247 @@
+{{! attach sources }}
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>{{groupId}}</groupId>
+    <artifactId>{{artifactId}}</artifactId>
+    <packaging>jar</packaging>
+    <name>{{artifactId}}</name>
+    <version>{{artifactVersion}}</version>
+    <properties>
+        <java.version>17</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        {{#springDocDocumentationProvider}}
+        <springdoc.version>2.0.2</springdoc.version>
+        {{/springDocDocumentationProvider}}
+        {{^springDocDocumentationProvider}}
+        {{#swagger2AnnotationLibrary}}
+        <swagger-annotations.version>}2.2.7</swagger-annotations.version>
+        {{/swagger2AnnotationLibrary}}
+        {{/springDocDocumentationProvider}}
+        {{#useSwaggerUI}}
+        <swagger-ui.version>4.15.5</swagger-ui.version>
+        {{/useSwaggerUI}}
+        {{#virtualService}}
+        <virtualan.version>2.5.2</virtualan.version>
+        {{/virtualService}}
+    </properties>
+{{#parentOverridden}}
+    <parent>
+        <groupId>{{{parentGroupId}}}</groupId>
+        <artifactId>{{{parentArtifactId}}}</artifactId>
+        <version>{{{parentVersion}}}</version>
+    </parent>
+{{/parentOverridden}}
+{{^parentOverridden}}
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.0.0</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+{{/parentOverridden}}
+    <repositories>
+        <repository>
+            <id>repository.spring.milestone</id>
+            <name>Spring Milestone Repository</name>
+            <url>https://repo.spring.io/milestone</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-milestones</id>
+            <url>https://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        {{#interfaceOnly}}
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        {{/interfaceOnly}}
+        {{^interfaceOnly}}
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                {{#classifier}}
+                <configuration>
+                  <classifier>{{{classifier}}}</classifier>
+                </configuration>
+                {{/classifier}}
+            </plugin>
+            {{#apiFirst}}
+            <plugin>
+                <groupId>org.openapitools</groupId>
+                <artifactId>openapi-generator-maven-plugin</artifactId>
+                <version>{{{generatorVersion}}}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>src/main/resources/openapi.yaml</inputSpec>
+                            <generatorName>spring</generatorName>
+                            <apiPackage>{{{apiPackage}}}</apiPackage>
+                            <modelPackage>{{{modelPackage}}}</modelPackage>
+                            <generateSupportingFiles>false</generateSupportingFiles>
+                            {{#modelNamePrefix}}
+                            <modelNamePrefix>{{{.}}}</modelNamePrefix>
+                            {{/modelNamePrefix}}
+                            {{#modelNameSuffix}}
+                            <modelNameSuffix>{{{.}}}</modelNameSuffix>
+                            {{/modelNameSuffix}}
+                            <configOptions>
+                            {{#configOptions}}
+                                <{{left}}>{{right}}</{{left}}>
+                            {{/configOptions}}
+                            </configOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            {{/apiFirst}}
+        </plugins>
+        {{/interfaceOnly}}
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web{{#reactive}}flux{{/reactive}}</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+        </dependency>
+        {{#springDocDocumentationProvider}}
+          <!--SpringDoc dependencies -->
+        {{#useSwaggerUI}}
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-ui</artifactId>
+            <version>${springdoc.version}</version>
+        </dependency>
+        {{/useSwaggerUI}}
+        {{^useSwaggerUI}}
+        <dependency>
+            <groupId>org.springdoc</groupId>
+          <artifactId>springdoc-openapi-starter-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-api</artifactId>
+            <version>${springdoc.version}</version>
+        </dependency>
+        {{/useSwaggerUI}}
+        {{/springDocDocumentationProvider}}
+        {{#useSwaggerUI}}
+        {{^springDocDocumentationProvider}}
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>swagger-ui</artifactId>
+            <version>${swagger-ui.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>webjars-locator-core</artifactId>
+        </dependency>
+        {{/springDocDocumentationProvider}}
+        {{/useSwaggerUI}}
+        {{^springDocDocumentationProvider}}
+        {{#swagger2AnnotationLibrary}}
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations.version}</version>
+        </dependency>
+        {{/swagger2AnnotationLibrary}}
+        {{/springDocDocumentationProvider}}
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
+        {{#withXml}}
+        <!-- XML processing: Jackson -->
+        <dependency>
+          <groupId>jakarta.xml.bind</groupId>
+          <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.dataformat</groupId>
+          <artifactId>jackson-dataformat-xml</artifactId>
+        </dependency>
+        {{/withXml}}
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+        {{#joda}}
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-joda</artifactId>
+        </dependency>
+        {{/joda}}
+        {{#openApiNullable}}
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>0.2.6</version>
+        </dependency>
+        {{/openApiNullable}}
+{{#useBeanValidation}}
+        <!-- Bean Validation API support -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+{{/useBeanValidation}}
+{{#virtualService}}
+    <!-- START Virtual Service API support -->
+        <dependency>
+            <groupId>io.virtualan</groupId>
+            <artifactId>virtualan-plugin</artifactId>
+            <version>${virtualan.version}</version>
+        </dependency>
+        <!-- HyperSQL DB -->
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+        </dependency>
+    <!-- END Virtual Service API support -->
+{{/virtualService}}
+{{#hateoas}}
+        <!-- Spring HATEOAS -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-hateoas</artifactId>
+        </dependency>
+{{/hateoas}}
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

package/targets/spring/templates/libraries/spring-boot/pom.mustache ADDED Viewed

@@ -0,0 +1,257 @@
+{{! attach sources }}
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>{{groupId}}</groupId>
+    <artifactId>{{artifactId}}</artifactId>
+    <packaging>jar</packaging>
+    <name>{{artifactId}}</name>
+    <version>{{artifactVersion}}</version>
+    <properties>
+        <java.version>1.8</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        {{#springFoxDocumentationProvider}}
+        <springfox.version>2.9.2</springfox.version>
+        {{/springFoxDocumentationProvider}}
+        {{#springDocDocumentationProvider}}
+        <springdoc.version>1.6.14</springdoc.version>
+        {{/springDocDocumentationProvider}}
+        {{^springFoxDocumentationProvider}}
+        {{^springDocDocumentationProvider}}
+        {{#swagger1AnnotationLibrary}}
+        <swagger-annotations.version>1.6.6</swagger-annotations.version>
+        {{/swagger1AnnotationLibrary}}
+        {{#swagger2AnnotationLibrary}}
+        <swagger-annotations.version>2.2.7</swagger-annotations.version>
+        {{/swagger2AnnotationLibrary}}
+        {{/springDocDocumentationProvider}}
+        {{/springFoxDocumentationProvider}}
+        {{#virtualService}}
+        <virtualan.version>2.5.2</virtualan.version>
+        {{/virtualService}}
+        {{#useSwaggerUI}}
+        <swagger-ui.version>4.15.5</swagger-ui.version>
+        {{/useSwaggerUI}}
+    </properties>
+{{#parentOverridden}}
+    <parent>
+        <groupId>{{{parentGroupId}}}</groupId>
+        <artifactId>{{{parentArtifactId}}}</artifactId>
+        <version>{{{parentVersion}}}</version>
+    </parent>
+{{/parentOverridden}}
+{{^parentOverridden}}
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>{{#springFoxDocumentationProvider}}2.5.14{{/springFoxDocumentationProvider}}{{^springFoxDocumentationProvider}}2.7.6{{/springFoxDocumentationProvider}}</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+{{/parentOverridden}}
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        {{#interfaceOnly}}
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        {{/interfaceOnly}}
+        {{^interfaceOnly}}
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                {{#classifier}}
+                <configuration>
+                  <classifier>{{{classifier}}}</classifier>
+                </configuration>
+                {{/classifier}}
+            </plugin>
+            {{#apiFirst}}
+            <plugin>
+                <groupId>org.openapitools</groupId>
+                <artifactId>openapi-generator-maven-plugin</artifactId>
+                <version>{{{generatorVersion}}}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>src/main/resources/openapi.yaml</inputSpec>
+                            <generatorName>spring</generatorName>
+                            <apiPackage>{{{apiPackage}}}</apiPackage>
+                            <modelPackage>{{{modelPackage}}}</modelPackage>
+                            <generateSupportingFiles>false</generateSupportingFiles>
+                            {{#modelNamePrefix}}
+                            <modelNamePrefix>{{{.}}}</modelNamePrefix>
+                            {{/modelNamePrefix}}
+                            {{#modelNameSuffix}}
+                            <modelNameSuffix>{{{.}}}</modelNameSuffix>
+                            {{/modelNameSuffix}}
+                            <configOptions>
+                            {{#configOptions}}
+                                <{{left}}>{{right}}</{{left}}>
+                            {{/configOptions}}
+                            </configOptions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            {{/apiFirst}}
+        </plugins>
+        {{/interfaceOnly}}
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web{{#reactive}}flux{{/reactive}}</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+        </dependency>
+        {{#springDocDocumentationProvider}}
+          <!--SpringDoc dependencies -->
+        {{#useSwaggerUI}}
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-{{#reactive}}webflux-{{/reactive}}ui</artifactId>
+            <version>${springdoc.version}</version>
+        </dependency>
+        {{/useSwaggerUI}}
+        {{^useSwaggerUI}}
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-core</artifactId>
+            <version>${springdoc.version}</version>
+        </dependency>
+        {{/useSwaggerUI}}
+        {{/springDocDocumentationProvider}}
+        {{#springFoxDocumentationProvider}}
+        <!--SpringFox dependencies -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${springfox.version}</version>
+        </dependency>
+        {{/springFoxDocumentationProvider}}
+        {{#useSwaggerUI}}
+        {{^springDocDocumentationProvider}}
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>swagger-ui</artifactId>
+            <version>${swagger-ui.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>webjars-locator-core</artifactId>
+        </dependency>
+        {{/springDocDocumentationProvider}}
+        {{/useSwaggerUI}}
+        {{^springFoxDocumentationProvider}}
+        {{^springDocDocumentationProvider}}
+        {{#swagger1AnnotationLibrary}}
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations.version}</version>
+        </dependency>
+        {{/swagger1AnnotationLibrary}}
+        {{#swagger2AnnotationLibrary}}
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations.version}</version>
+        </dependency>
+        {{/swagger2AnnotationLibrary}}
+        {{/springDocDocumentationProvider}}
+        {{/springFoxDocumentationProvider}}
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
+        </dependency>
+        {{#withXml}}
+        <!-- XML processing: Jackson -->
+        <dependency>
+          <groupId>jakarta.xml.bind</groupId>
+          <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.dataformat</groupId>
+          <artifactId>jackson-dataformat-xml</artifactId>
+        </dependency>
+        {{/withXml}}
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+        {{#joda}}
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-joda</artifactId>
+        </dependency>
+        {{/joda}}
+        {{#openApiNullable}}
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>0.2.6</version>
+        </dependency>
+        {{/openApiNullable}}
+{{#useBeanValidation}}
+        <!-- Bean Validation API support -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+{{/useBeanValidation}}
+{{#virtualService}}
+    <!-- START Virtual Service API support -->
+        <dependency>
+            <groupId>io.virtualan</groupId>
+            <artifactId>virtualan-plugin</artifactId>
+            <version>${virtualan.version}</version>
+        </dependency>
+        <!-- HyperSQL DB -->
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+        </dependency>
+    <!-- END Virtual Service API support -->
+{{/virtualService}}
+{{#hateoas}}
+        <!-- Spring HATEOAS -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-hateoas</artifactId>
+        </dependency>
+{{/hateoas}}
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

package/targets/spring-kotlin/generator-config.json CHANGED Viewed

@@ -18,9 +18,9 @@
     "java.time.OffsetDateTime": "java.time.Instant",
     "org.springframework.core.io.Resource": "org.springframework.web.multipart.MultipartFile"
   },
-  "inlineSchemaNameDefaults": {
-    "arrayItemSuffix": "",
-    "mapItemSuffix": "",
+  "inlineSchemaOptions": {
+    "ARRAY_ITEM_SUFFIX": "",
+    "MAP_ITEM_SUFFIX": "",
     "SKIP_SCHEMA_REUSE": "true"
   }
 }

package/targets/spring-kotlin/templates/libraries/spring-boot/pom-sb3.mustache CHANGED Viewed

@@ -1,4 +1,3 @@
-{{! optionally removes spring boot plugin if interfaceOnly flag is set }}
 {{! attach sources }}
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

package/targets/spring-kotlin/templates/libraries/spring-boot/pom.mustache CHANGED Viewed

@@ -1,4 +1,3 @@
-{{! optionally removes spring boot plugin if interfaceOnly flag is set }}
 {{! attach sources }}
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

package/targets/feign-kotlin/templates/libraries/dataClassReqVar.mustache DELETED Viewed

@@ -1,5 +0,0 @@
-{{! generate required nullable properties as optional }}
-{{#useBeanValidation}}{{>beanValidation}}{{>beanValidationModel}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}
-    @Schema({{#example}}example = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{.}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}", {{/example}}required = true, {{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}description = "{{{description}}}"){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}
-    @ApiModelProperty({{#example}}example = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{.}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}", {{/example}}required = true, {{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swagger1AnnotationLibrary}}
-    @get:JsonProperty("{{{baseName}}}", required = true){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{{nameInCamelCase}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isReadOnly}}?{{/isReadOnly}}{{#isNullable}}?{{/isNullable}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{#isReadOnly}}{{^defaultValue}} = null{{/defaultValue}}{{/isReadOnly}}

package/targets/feign-kotlin/templates/libraries/spring-cloud/apiInterface.mustache DELETED Viewed

@@ -1,108 +0,0 @@
-{{! fix left in @RequestMapping }}
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) ({{{generatorVersion}}}).
- * https://openapi-generator.tech
- * Do not edit the class manually.
-*/
-package {{package}}
-{{#imports}}import {{import}}
-{{/imports}}
-{{#swagger2AnnotationLibrary}}
-import io.swagger.v3.oas.annotations.*
-import io.swagger.v3.oas.annotations.enums.*
-import io.swagger.v3.oas.annotations.media.*
-import io.swagger.v3.oas.annotations.responses.*
-import io.swagger.v3.oas.annotations.security.*
-{{/swagger2AnnotationLibrary}}
-{{#swagger1AnnotationLibrary}}
-import io.swagger.annotations.Api
-import io.swagger.annotations.ApiOperation
-import io.swagger.annotations.ApiParam
-import io.swagger.annotations.ApiResponse
-import io.swagger.annotations.ApiResponses
-import io.swagger.annotations.Authorization
-import io.swagger.annotations.AuthorizationScope
-{{/swagger1AnnotationLibrary}}
-import org.springframework.http.HttpStatus
-import org.springframework.http.MediaType
-import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.*
-{{#useBeanValidation}}
-import org.springframework.validation.annotation.Validated
-{{/useBeanValidation}}
-import org.springframework.web.context.request.NativeWebRequest
-import org.springframework.beans.factory.annotation.Autowired
-{{#useBeanValidation}}
-import {{javaxPackage}}.validation.constraints.DecimalMax
-import {{javaxPackage}}.validation.constraints.DecimalMin
-import {{javaxPackage}}.validation.constraints.Email
-import {{javaxPackage}}.validation.constraints.Max
-import {{javaxPackage}}.validation.constraints.Min
-import {{javaxPackage}}.validation.constraints.NotNull
-import {{javaxPackage}}.validation.constraints.Pattern
-import {{javaxPackage}}.validation.constraints.Size
-import {{javaxPackage}}.validation.Valid
-{{/useBeanValidation}}
-{{#reactive}}
-import kotlinx.coroutines.flow.Flow
-{{/reactive}}
-import kotlin.collections.List
-import kotlin.collections.Map
-{{#useBeanValidation}}
-@Validated
-{{/useBeanValidation}}
-{{#swagger1AnnotationLibrary}}
-@Api(value = "{{{baseName}}}", description = "The {{{baseName}}} API")
-{{/swagger1AnnotationLibrary}}
-{{#operations}}
-interface {{classname}} {
-{{#isDelegate}}
-    fun getDelegate(): {{classname}}Delegate = object: {{classname}}Delegate {}
-{{/isDelegate}}
-{{#operation}}
-    {{#swagger2AnnotationLibrary}}
-    @Operation(
-        summary = "{{{summary}}}",
-        operationId = "{{{operationId}}}",
-        description = """{{{unescapedNotes}}}""",
-        responses = [{{#responses}}
-            ApiResponse(responseCode = "{{{code}}}", description = "{{{message}}}"{{#baseType}}, content = [Content(schema = Schema(implementation = {{{baseType}}}::class))]{{/baseType}}){{^-last}},{{/-last}}{{/responses}}
-        ]{{#hasAuthMethods}},
-        security = [ {{#authMethods}}SecurityRequirement(name = "{{name}}"{{#isOAuth}}, scopes = [ {{#scopes}}"{{scope}}"{{^-last}}, {{/-last}}{{/scopes}} ]{{/isOAuth}}){{^-last}},{{/-last}}{{/authMethods}} ]{{/hasAuthMethods}}
-    ){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}
-    @ApiOperation(
-        value = "{{{summary}}}",
-        nickname = "{{{operationId}}}",
-        notes = "{{{notes}}}"{{#returnBaseType}},
-        response = {{{.}}}::class{{/returnBaseType}}{{#returnContainer}},
-        responseContainer = "{{{.}}}"{{/returnContainer}}{{#hasAuthMethods}},
-        authorizations = [{{#authMethods}}Authorization(value = "{{name}}"{{#isOAuth}}, scopes = [{{#scopes}}AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}}, {{/-last}}{{/scopes}}]{{/isOAuth}}){{^-last}}, {{/-last}}{{/authMethods}}]{{/hasAuthMethods}})
-    @ApiResponses(
-        value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{.}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}}, {{/-last}}{{/responses}}]){{/swagger1AnnotationLibrary}}
-    @RequestMapping(
-            method = [RequestMethod.{{httpMethod}}],
-            value = ["{{#lambda.escapeDoubleQuote}}{{path}}{{/lambda.escapeDoubleQuote}}"]{{#singleContentTypes}}{{#hasProduces}},
-            produces = "{{{vendorExtensions.x-accepts}}}"{{/hasProduces}}{{#hasConsumes}},
-            consumes = "{{{vendorExtensions.x-content-type}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}},
-            produces = [{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}},
-            consumes = [{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}]{{/hasConsumes}}{{/singleContentTypes}}
-    )
-    {{#reactive}}{{^isArray}}suspend {{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): ResponseEntity<{{>returnTypes}}>{{^skipDefaultInterface}} {
-        {{^isDelegate}}
-        return {{>returnValue}}
-        {{/isDelegate}}
-        {{#isDelegate}}
-        return getDelegate().{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}})
-        {{/isDelegate}}
-    }{{/skipDefaultInterface}}
-{{/operation}}
-}
-{{/operations}}

package/targets/spring-kotlin/templates/dataClassReqVar.mustache DELETED Viewed

@@ -1,5 +0,0 @@
-{{! generate required nullable properties as optional }}
-{{#useBeanValidation}}{{>beanValidation}}{{>beanValidationModel}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}
-    @Schema({{#example}}example = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{.}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}", {{/example}}required = true, {{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}description = "{{{description}}}"){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}
-    @ApiModelProperty({{#example}}example = "{{#lambdaRemoveLineBreak}}{{#lambdaEscapeDoubleQuote}}{{{.}}}{{/lambdaEscapeDoubleQuote}}{{/lambdaRemoveLineBreak}}", {{/example}}required = true, {{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}"){{/swagger1AnnotationLibrary}}
-    @get:JsonProperty("{{{baseName}}}", required = true){{#isInherited}} override{{/isInherited}} {{>modelMutable}} {{{name}}}: {{#isEnum}}{{#isArray}}{{baseType}}<{{/isArray}}{{classname}}.{{{nameInCamelCase}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isReadOnly}}?{{/isReadOnly}}{{#isNullable}}?{{/isNullable}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{#isReadOnly}}{{^defaultValue}} = null{{/defaultValue}}{{/isReadOnly}}