From f8ff8c87609b1ca36fa26fb8474806999638195e Mon Sep 17 00:00:00 2001
From: Nathan Baulch <nathan.baulch@gmail.com>
Date: Thu, 5 Aug 2021 14:12:47 +1000
Subject: [PATCH] Reorder tags that handle missing values

---
 .../Java/libraries/microprofile/enumOuterClass.mustache       | 2 +-
 .../src/main/resources/Java/modelEnum.mustache                | 2 +-
 .../src/main/resources/Java/modelInnerEnum.mustache           | 2 +-
 .../main/resources/JavaJaxRS/cxf-ext/enumOuterClass.mustache  | 2 +-
 .../src/main/resources/JavaJaxRS/cxf/enumOuterClass.mustache  | 2 +-
 .../src/main/resources/JavaJaxRS/enumClass.mustache           | 2 +-
 .../src/main/resources/JavaJaxRS/enumOuterClass.mustache      | 2 +-
 .../src/main/resources/JavaJaxRS/modelEnum.mustache           | 2 +-
 .../main/resources/JavaJaxRS/resteasy/eap/enumClass.mustache  | 2 +-
 .../src/main/resources/JavaJaxRS/resteasy/enumClass.mustache  | 2 +-
 .../src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache | 2 +-
 .../resources/JavaSpring/libraries/spring-mvc/README.mustache | 2 +-
 .../resources/JavaSpring/libraries/spring-mvc/pom.mustache    | 2 +-
 .../main/resources/JavaVertXServer/enumOuterClass.mustache    | 2 +-
 .../main/resources/JavaVertXWebServer/enumOuterClass.mustache | 2 +-
 .../src/main/resources/aspnetcore/2.0/Project.csproj.mustache | 2 +-
 .../src/main/resources/aspnetcore/2.0/model.mustache          | 2 +-
 .../src/main/resources/aspnetcore/2.1/Project.csproj.mustache | 2 +-
 .../src/main/resources/aspnetcore/2.1/Project.nuspec.mustache | 2 +-
 .../src/main/resources/aspnetcore/2.1/model.mustache          | 2 +-
 .../src/main/resources/aspnetcore/3.0/Project.csproj.mustache | 2 +-
 .../src/main/resources/aspnetcore/3.0/Project.nuspec.mustache | 2 +-
 .../src/main/resources/aspnetcore/3.0/model.mustache          | 2 +-
 .../src/main/resources/csharp-nancyfx/modelEnum.mustache      | 2 +-
 .../src/main/resources/csharp-nancyfx/modelGeneric.mustache   | 4 ++--
 .../src/main/resources/csharp-nancyfx/modelMutable.mustache   | 2 +-
 .../src/main/resources/csharp-netcore/modelEnum.mustache      | 2 +-
 .../src/main/resources/csharp-netcore/modelGeneric.mustache   | 4 ++--
 .../src/main/resources/csharp-netcore/modelInnerEnum.mustache | 2 +-
 .../src/main/resources/csharp/enumClass.mustache              | 2 +-
 .../src/main/resources/csharp/modelEnum.mustache              | 2 +-
 .../src/main/resources/csharp/modelGeneric.mustache           | 4 ++--
 .../src/main/resources/csharp/modelInnerEnum.mustache         | 2 +-
 .../main/resources/java-pkmst/resources/application.mustache  | 2 +-
 .../resources/scala-play-server/returnTypeOrUnit.mustache     | 2 +-
 35 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumOuterClass.mustache
index 33f6c3b6e41..894ce951f38 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumOuterClass.mustache
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 {{/jackson}}
 
 /**
- * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+ * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
  */
 {{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
   {{#gson}}
diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache
index 538ec6f4b93..f81c7c93ff1 100644
--- a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache
@@ -11,7 +11,7 @@ import com.google.gson.stream.JsonWriter;
 {{/gson}}
 
 /**
- * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+ * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
  */
 {{#gson}}
 @JsonAdapter({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.Adapter.class)
diff --git a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
index 9515604499b..a9c99783fd0 100644
--- a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
@@ -1,5 +1,5 @@
   /**
-   * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+   * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
    */
 {{#gson}}
   @JsonAdapter({{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}.Adapter.class)
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/enumOuterClass.mustache
index d3f1dc16b85..149cb8a9953 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/enumOuterClass.mustache
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 {{/jackson}}
 
 /**
- * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+ * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
  */
 {{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
   {{#gson}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/enumOuterClass.mustache
index d3f1dc16b85..149cb8a9953 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/enumOuterClass.mustache
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 {{/jackson}}
 
 /**
- * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+ * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
  */
 {{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
   {{#gson}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache
index 0061f485834..d5394d737de 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache
@@ -1,5 +1,5 @@
   /**
-   * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+   * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
    */
   {{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
     {{#gson}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/enumOuterClass.mustache
index 0c3afe371ff..f41a3eb8455 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/enumOuterClass.mustache
@@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 {{/jackson}}
 
 /**
- * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+ * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
  */
 {{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
   {{#gson}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache
index 8eca021eed6..ba82ea473b4 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 {{/jackson}}
 
 /**
- * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+ * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
  */
 {{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
   {{#gson}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/enumClass.mustache
index 3b97a442fcf..5dca420a51c 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/eap/enumClass.mustache
@@ -1,5 +1,5 @@
   /**
-   * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+   * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
    */
   {{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
     {{#allowableValues}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/enumClass.mustache
index 3b97a442fcf..5dca420a51c 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/enumClass.mustache
@@ -1,5 +1,5 @@
   /**
-   * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+   * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
    */
   {{>additionalEnumTypeAnnotations}}public enum {{datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} {
     {{#allowableValues}}
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache
index 3afa20497d2..66f6745ff9f 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 {{/jackson}}
 
 /**
- * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+ * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
  */
 {{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
   {{#gson}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/README.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/README.mustache
index 5226d085d6e..efc3e8921a6 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/README.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/README.mustache
@@ -11,4 +11,4 @@ The underlying library integrating OpenAPI to Spring-MVC is [springfox](https://
 
 {{/useSpringfox}}
 You can view the server in swagger-ui by pointing to
-http://localhost:{{serverPort}}{{^contextPath}}/{{/contextPath}}{{contextPath}}/
\ No newline at end of file
+http://localhost:{{serverPort}}{{contextPath}}{{^contextPath}}/{{/contextPath}}/
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache
index eedb7d60906..e7ca6777fca 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache
@@ -38,7 +38,7 @@
                 <version>${jetty-version}</version>
                 <configuration>
                     <webAppConfig>
-                        <contextPath>{{^contextPath}}/{{/contextPath}}{{contextPath}}</contextPath>
+                        <contextPath>{{contextPath}}{{^contextPath}}/{{/contextPath}}</contextPath>
                     </webAppConfig>
                     <webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
                     <stopPort>8079</stopPort>
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/enumOuterClass.mustache
index 8581d856c97..0db4c738079 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXServer/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/enumOuterClass.mustache
@@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
- * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+ * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
  */
 {{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
   {{#allowableValues}}{{#enumVars}}
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/enumOuterClass.mustache
index 73fef2662b4..8d64ba3eb88 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXWebServer/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXWebServer/enumOuterClass.mustache
@@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 
 /**
- * {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+ * {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
  */
 {{>additionalEnumTypeAnnotations}}public enum {{{datatypeWithEnum}}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} {
   {{#allowableValues}}{{#enumVars}}
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 6732557feeb..c67bdaab878 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,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <Description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</Description>
+    <Description>{{packageDescription}}{{^packageDescription}}{{packageName}}{{/packageDescription}}</Description>
     <Copyright>{{packageCopyright}}</Copyright>
     <Authors>{{packageAuthors}}</Authors>
     <TargetFramework>netcoreapp2.0</TargetFramework>
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
index b8e95da9c47..d28375e4b9b 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
@@ -31,7 +31,7 @@ namespace {{packageName}}.Models
         {{/complexType}}
         {{/isEnum}}
         /// <summary>
-        /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+        /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
         /// </summary>
         {{#description}}
         /// <value>{{.}}</value>
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 88a0fd7e44e..f257cb18aca 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,6 +1,6 @@
 <Project Sdk="{{projectSdk}}">
   <PropertyGroup>
-    <Description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</Description>
+    <Description>{{packageDescription}}{{^packageDescription}}{{packageName}}{{/packageDescription}}</Description>
     <Copyright>{{packageCopyright}}</Copyright>
     <Authors>{{packageAuthors}}</Authors>
     <TargetFramework>netcoreapp{{aspnetCoreVersion}}</TargetFramework>
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 d6a52c2c20a..0849b54d06d 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
@@ -12,7 +12,7 @@
         <iconUrl>http://ICON_URL_HERE_OR_DELETE_THIS_LINE</iconUrl>
         -->
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</description>
+        <description>{{packageDescription}}{{^packageDescription}}{{packageName}}{{/packageDescription}}</description>
         <releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
         <copyright>{{packageCopyright}}</copyright>
         <tags>{{packageName}}</tags>
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
index a4758249d86..9b146b15871 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
@@ -33,7 +33,7 @@ namespace {{modelPackage}}
         {{/complexType}}
         {{/isEnum}}
         /// <summary>
-        /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+        /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
         /// </summary>{{#description}}
         /// <value>{{.}}</value>{{/description}}{{#required}}
         [Required]{{/required}}{{#pattern}}
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 ee3ced7ba19..889efc0161d 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,6 +1,6 @@
 <Project Sdk="{{projectSdk}}">
   <PropertyGroup>
-    <Description>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</Description>
+    <Description>{{packageDescription}}{{^packageDescription}}{{packageName}}{{/packageDescription}}</Description>
     <Copyright>{{packageCopyright}}</Copyright>
     <Authors>{{packageAuthors}}</Authors>
     <TargetFramework>{{targetFramework}}</TargetFramework>
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 b97c14d13d3..1d24d331642 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>{{^packageDescription}}{{packageName}}{{/packageDescription}}{{packageDescription}}</description>
+    <description>{{packageDescription}}{{^packageDescription}}{{packageName}}{{/packageDescription}}</description>
     <releaseNotes>Summary of changes made in this release of the package.</releaseNotes>
     <copyright>{{packageCopyright}}</copyright>
     <tags>{{packageName}}</tags>
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache
index 0db3be9f6ff..917e3680492 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/model.mustache
@@ -46,7 +46,7 @@ namespace {{modelPackage}}
         {{/complexType}}
         {{/isEnum}}
         /// <summary>
-        /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+        /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
         /// </summary>{{#description}}
         /// <value>{{.}}</value>{{/description}}{{#required}}
         [Required]{{/required}}{{#pattern}}
diff --git a/modules/openapi-generator/src/main/resources/csharp-nancyfx/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-nancyfx/modelEnum.mustache
index f82bf6da763..01c5ec32aa1 100644
--- a/modules/openapi-generator/src/main/resources/csharp-nancyfx/modelEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-nancyfx/modelEnum.mustache
@@ -1,5 +1,5 @@
     /// <summary>
-    /// {{^description}}Defines {{{name}}}{{/description}}{{description}}
+    /// {{description}}{{^description}}Defines {{{name}}}{{/description}}
     /// </summary>
     {{#description}}
     /// <value>{{.}}</value>
diff --git a/modules/openapi-generator/src/main/resources/csharp-nancyfx/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-nancyfx/modelGeneric.mustache
index d3608a1cca3..8bb564a7971 100644
--- a/modules/openapi-generator/src/main/resources/csharp-nancyfx/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-nancyfx/modelGeneric.mustache
@@ -4,7 +4,7 @@
     public {{^hasChildren}}sealed {{/hasChildren}}class {{classname}}: {{#parent}}{{{.}}}, {{/parent}} IEquatable<{{classname}}>
     { {{#vars}}{{^isInherited}}
         /// <summary>
-        /// {{^description}}{{{name}}}{{/description}}{{description}}
+        /// {{description}}{{^description}}{{{name}}}{{/description}}
         /// </summary>
         public {{>nullableDataType}} {{name}} { get; private set; }
 {{/isInherited}}{{/vars}}
@@ -118,7 +118,7 @@
             /// <summary>
             /// Sets value for {{classname}}.{{{name}}} property.
             /// </summary>
-            /// <param name="value">{{^description}}{{{name}}}{{/description}}{{description}}</param>
+            /// <param name="value">{{description}}{{^description}}{{{name}}}{{/description}}</param>
             public {{classname}}Builder {{name}}({{>nullableDataType}} value)
             {
                 _{{name}} = value;
diff --git a/modules/openapi-generator/src/main/resources/csharp-nancyfx/modelMutable.mustache b/modules/openapi-generator/src/main/resources/csharp-nancyfx/modelMutable.mustache
index 7abd269e37b..3ab64e3b06e 100644
--- a/modules/openapi-generator/src/main/resources/csharp-nancyfx/modelMutable.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-nancyfx/modelMutable.mustache
@@ -20,7 +20,7 @@ namespace {{packageName}}.{{packageContext}}.Models
     public {{^hasChildren}}sealed {{/hasChildren}}class {{classname}}: {{#parent}}{{{.}}}, {{/parent}} IEquatable<{{classname}}>
     { {{#vars}}{{^isInherited}}
         /// <summary>
-        /// {{^description}}{{{name}}}{{/description}}{{description}}
+        /// {{description}}{{^description}}{{{name}}}{{/description}}
         /// </summary>
         public {{>nullableDataType}} {{name}} { get; set; }
 {{/isInherited}}{{/vars}}
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache
index 81863c4f3df..d781952b4e0 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelEnum.mustache
@@ -1,5 +1,5 @@
     /// <summary>
-    /// {{^description}}Defines {{{name}}}{{/description}}{{description}}
+    /// {{description}}{{^description}}Defines {{{name}}}{{/description}}
     /// </summary>
     {{#description}}
     /// <value>{{.}}</value>
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache
index de7560c3d66..aaff4be3e25 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelGeneric.mustache
@@ -26,7 +26,7 @@
         {{#isEnum}}
 
         /// <summary>
-        /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+        /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
         /// </summary>
         {{#description}}
         /// <value>{{.}}</value>
@@ -185,7 +185,7 @@
         {{^isInherited}}
         {{^isEnum}}
         /// <summary>
-        /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+        /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
         /// </summary>{{#description}}
         /// <value>{{.}}</value>{{/description}}
         {{^conditionalSerialization}}
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache
index 117469e3182..6af921832af 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelInnerEnum.mustache
@@ -1,6 +1,6 @@
         {{^isContainer}}
         /// <summary>
-        /// {{^description}}Defines {{{name}}}{{/description}}{{description}}
+        /// {{description}}{{^description}}Defines {{{name}}}{{/description}}
         /// </summary>
         {{#description}}
         /// <value>{{.}}</value>
diff --git a/modules/openapi-generator/src/main/resources/csharp/enumClass.mustache b/modules/openapi-generator/src/main/resources/csharp/enumClass.mustache
index 5882bd59ba6..ee1d5a1885a 100644
--- a/modules/openapi-generator/src/main/resources/csharp/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/enumClass.mustache
@@ -1,5 +1,5 @@
         /// <summary>
-        /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+        /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
         /// </summary>
         {{#description}}
         /// <value>{{.}}</value>
diff --git a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache
index 52d2fc9cbc1..91be597da01 100644
--- a/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/modelEnum.mustache
@@ -1,5 +1,5 @@
     /// <summary>
-    /// {{^description}}Defines {{{name}}}{{/description}}{{description}}
+    /// {{description}}{{^description}}Defines {{{name}}}{{/description}}
     /// </summary>
     {{#description}}
     /// <value>{{.}}</value>
diff --git a/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache
index 6515cf63d1a..bf8b1de91b3 100644
--- a/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache
@@ -26,7 +26,7 @@
         {{/isEnum}}
         {{#isEnum}}
         /// <summary>
-        /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+        /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
         /// </summary>
         {{#description}}
         /// <value>{{.}}</value>
@@ -108,7 +108,7 @@ this.{{name}} = {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}};
         {{^isInherited}}
         {{^isEnum}}
         /// <summary>
-        /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{description}}
+        /// {{description}}{{^description}}Gets or Sets {{{name}}}{{/description}}
         /// </summary>{{#description}}
         /// <value>{{.}}</value>{{/description}}
         [DataMember(Name="{{baseName}}", EmitDefaultValue={{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}{{#required}}true{{/required}}{{^required}}false{{/required}}{{/isNullable}}{{/vendorExtensions.x-emit-default-value}})]{{#isDate}}
diff --git a/modules/openapi-generator/src/main/resources/csharp/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/csharp/modelInnerEnum.mustache
index 90a5c59b8ac..4187d95bd04 100644
--- a/modules/openapi-generator/src/main/resources/csharp/modelInnerEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/modelInnerEnum.mustache
@@ -1,6 +1,6 @@
         {{^isContainer}}
         /// <summary>
-        /// {{^description}}Defines {{{name}}}{{/description}}{{description}}
+        /// {{description}}{{^description}}Defines {{{name}}}{{/description}}
         /// </summary>
         {{#description}}
         /// <value>{{.}}</value>
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/resources/application.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/resources/application.mustache
index f53bafeacbc..3b7f2d43a3f 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/resources/application.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/resources/application.mustache
@@ -1,5 +1,5 @@
 springfox.documentation.swagger.v2.path=/api-docs
-server.contextPath={{^contextPath}}/{{/contextPath}}{{contextPath}}
+server.contextPath={{contextPath}}{{^contextPath}}/{{/contextPath}}
 server.port={{serverPort}}
 spring.jackson.date-format={{basePackage}}.RFC3339DateFormat
 spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/scala-play-server/returnTypeOrUnit.mustache b/modules/openapi-generator/src/main/resources/scala-play-server/returnTypeOrUnit.mustache
index 1b1f6062a5b..945ae1c33cd 100644
--- a/modules/openapi-generator/src/main/resources/scala-play-server/returnTypeOrUnit.mustache
+++ b/modules/openapi-generator/src/main/resources/scala-play-server/returnTypeOrUnit.mustache
@@ -1 +1 @@
-{{#supportAsync}}Future[{{/supportAsync}}{{^returnType}}Unit{{/returnType}}{{returnType}}{{#supportAsync}}]{{/supportAsync}}
\ No newline at end of file
+{{#supportAsync}}Future[{{/supportAsync}}{{returnType}}{{^returnType}}Unit{{/returnType}}{{#supportAsync}}]{{/supportAsync}}
\ No newline at end of file