From 155b03bfe3c0671d3bcdf7ce617ff4a2618235a2 Mon Sep 17 00:00:00 2001 From: Felix Winterhalter <felix.winterhalter@fau.de> Date: Wed, 17 Mar 2021 18:14:51 +0100 Subject: [PATCH 1/2] Update aspnetcore nuspec and csproj with authors and description --- docs/generators/aspnetcore.md | 1 + .../languages/AspNetCoreServerCodegen.java | 5 +++ .../aspnetcore/2.0/Project.csproj.mustache | 5 +-- .../aspnetcore/2.1/Project.csproj.mustache | 5 +-- .../aspnetcore/2.1/Project.nuspec.mustache | 34 +++++++++---------- .../aspnetcore/3.0/Project.csproj.mustache | 5 +-- .../aspnetcore/3.0/Project.nuspec.mustache | 2 +- .../Org.OpenAPITools/Org.OpenAPITools.csproj | 5 +-- .../org/openapitools/api/TestHeadersApi.java | 1 - .../openapitools/api/TestQueryParamsApi.java | 1 - 10 files changed, 36 insertions(+), 28 deletions(-) diff --git a/docs/generators/aspnetcore.md b/docs/generators/aspnetcore.md index 10efd153077..0a30830099f 100644 --- a/docs/generators/aspnetcore.md +++ b/docs/generators/aspnetcore.md @@ -24,6 +24,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |operationResultTask|Set methods result to Task<>.| |false| |packageAuthors|Specifies Authors property in the .NET Core project file.| |OpenAPI| |packageCopyright|Specifies an AssemblyCopyright for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |No Copyright| +|packageDescription|Specifies a AssemblyDescription for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |A library generated from a OpenAPI doc| |packageGuid|The GUID that will be associated with the C# project| |null| |packageName|C# package name (convention: Title.Case).| |Org.OpenAPITools| |packageTitle|Specifies an AssemblyTitle for the .NET Framework global assembly attributes stored in the AssemblyInfo file.| |OpenAPI Library| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java index 09460b3a7ff..622363e8d05 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java @@ -21,6 +21,7 @@ import com.samskivert.mustache.Mustache; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.util.SchemaTypeUtil; +import org.mozilla.javascript.optimizer.Codegen; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.utils.ModelUtils; @@ -148,6 +149,10 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen { setSupportNullable(Boolean.TRUE); // CLI options + addOption(CodegenConstants.PACKAGE_DESCRIPTION, + CodegenConstants.PACKAGE_DESCRIPTION_DESC, + packageDescription); + addOption(CodegenConstants.LICENSE_URL, CodegenConstants.LICENSE_URL_DESC, licenseUrl); diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Project.csproj.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Project.csproj.mustache index 184fe7dcff7..6732557feeb 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Project.csproj.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Project.csproj.mustache @@ -1,7 +1,8 @@ <Project Sdk="Microsoft.NET.Sdk.Web"> <PropertyGroup> - <Description>{{packageName}}</Description> - <Copyright>{{packageName}}</Copyright> + <Description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</Description> + <Copyright>{{packageCopyright}}</Copyright> + <Authors>{{packageAuthors}}</Authors> <TargetFramework>netcoreapp2.0</TargetFramework> <Version>{{packageVersion}}</Version> <GenerateDocumentationFile>true</GenerateDocumentationFile> diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.csproj.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.csproj.mustache index bb25404ee10..88a0fd7e44e 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.csproj.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.csproj.mustache @@ -1,7 +1,8 @@ <Project Sdk="{{projectSdk}}"> <PropertyGroup> - <Description>{{packageName}}</Description> - <Copyright>{{packageName}}</Copyright> + <Description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</Description> + <Copyright>{{packageCopyright}}</Copyright> + <Authors>{{packageAuthors}}</Authors> <TargetFramework>netcoreapp{{aspnetCoreVersion}}</TargetFramework> <GenerateDocumentationFile>true</GenerateDocumentationFile> <PreserveCompilationContext>true</PreserveCompilationContext> diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.nuspec.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.nuspec.mustache index 03490d71129..d6a52c2c20a 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.nuspec.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.nuspec.mustache @@ -1,20 +1,20 @@ <?xml version="1.0"?> <package > - <metadata> - <id>$id$</id> - <version>{{packageVersion}}</version> - <title>{{packageTitle}}</title> - <authors>{{packageAuthors}}</authors> - <owners>{{packageAuthors}}</owners> - <licenseUrl>{{licenseUrl}}</licenseUrl> - <!-- - <projectUrl>http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE</projectUrl> - <iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl> - --> - <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>{{packageName}}</description> - <releaseNotes>Summary of changes made in this release of the package.</releaseNotes> - <copyright>{{packageCopyright}}</copyright> - <tags>{{packageName}}</tags> - </metadata> + <metadata> + <id>$id$</id> + <version>{{packageVersion}}</version> + <title>{{packageTitle}}</title> + <authors>{{packageAuthors}}</authors> + <owners>{{packageAuthors}}</owners> + <licenseUrl>{{licenseUrl}}</licenseUrl> + <!-- + <projectUrl>http://PROJECT_URL_HERE_OR_DELETE_THIS_LINE</projectUrl> + <iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl> + --> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</description> + <releaseNotes>Summary of changes made in this release of the package.</releaseNotes> + <copyright>{{packageCopyright}}</copyright> + <tags>{{packageName}}</tags> + </metadata> </package> diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache index 69d7cca51d2..70f7388a988 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache @@ -1,7 +1,8 @@ <Project Sdk="{{projectSdk}}"> <PropertyGroup> - <Description>{{packageName}}</Description> - <Copyright>{{packageName}}</Copyright> + <Description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</Description> + <Copyright>{{packageCopyright}}</Copyright> + <Authors>{{packageAuthors}}</Authors> <TargetFramework>{{targetFramework}}</TargetFramework> <GenerateDocumentationFile>true</GenerateDocumentationFile> <PreserveCompilationContext>true</PreserveCompilationContext> diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.nuspec.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.nuspec.mustache index 03490d71129..b97c14d13d3 100644 --- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.nuspec.mustache +++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.nuspec.mustache @@ -12,7 +12,7 @@ <iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl> --> <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>{{packageName}}</description> + <description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</description> <releaseNotes>Summary of changes made in this release of the package.</releaseNotes> <copyright>{{packageCopyright}}</copyright> <tags>{{packageName}}</tags> diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 0c249b1cb98..44fe2b0a0a2 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -1,7 +1,8 @@ <Project Sdk="Microsoft.NET.Sdk.Web"> <PropertyGroup> - <Description>Org.OpenAPITools</Description> - <Copyright>Org.OpenAPITools</Copyright> + <Description>A library generated from a OpenAPI doc</Description> + <Copyright>No Copyright</Copyright> + <Authors>OpenAPI</Authors> <TargetFramework>netcoreapp2.2</TargetFramework> <GenerateDocumentationFile>true</GenerateDocumentationFile> <PreserveCompilationContext>true</PreserveCompilationContext> diff --git a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java index 6aea0da1bf2..2e9994a9f74 100644 --- a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java +++ b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestHeadersApi.java @@ -12,7 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.data.domain.Pageable; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; diff --git a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java index 337027e4cb7..dd696891f1b 100644 --- a/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java +++ b/samples/server/petstore/spring-mvc-default-value/src/main/java/org/openapitools/api/TestQueryParamsApi.java @@ -12,7 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; -import org.springframework.data.domain.Pageable; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.multipart.MultipartFile; -- GitLab From 28703c40e4210a542336085717e1de25a48f6c2a Mon Sep 17 00:00:00 2001 From: Felix Winterhalter <felix.winterhalter@fau.de> Date: Thu, 18 Mar 2021 10:14:16 +0100 Subject: [PATCH 2/2] Removed unneccesary include --- .../openapitools/codegen/languages/AspNetCoreServerCodegen.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java index 622363e8d05..2b117934b76 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java @@ -21,7 +21,6 @@ import com.samskivert.mustache.Mustache; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.parser.util.SchemaTypeUtil; -import org.mozilla.javascript.optimizer.Codegen; import org.openapitools.codegen.*; import org.openapitools.codegen.meta.features.*; import org.openapitools.codegen.utils.ModelUtils; -- GitLab