[3.0.0] Clean up tasks for "html" and "dynamic-html"

bin/dynamic-html.sh

@@ -28,4 +28,4 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l dynamic-html  -o samples/dynamic-html"
 
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/html-markdown.sh

@@ -28,4 +28,4 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/markdown.yaml -l html  -o samples/html.md"
 
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/html-petstore.sh

@@ -28,4 +28,4 @@ fi
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l html  -o samples/html"
 
-# java $JAVA_OPTS -jar $executable $ags
+java $JAVA_OPTS -jar $executable $ags

bin/windows/dynamic-html-petstore.bat

@@ -7,4 +7,4 @@ If Not Exist %executable% (
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
 set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l dynamic-html -o samples\client\petstore\dynamic-html
 
-REM java %JAVA_OPTS% -jar %executable% %ags%
+java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/html-petstore.bat

@@ -7,4 +7,4 @@ If Not Exist %executable% (
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
 set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l html -o samples\client\petstore\html
 
-REM java %JAVA_OPTS% -jar %executable% %ags%
+java %JAVA_OPTS% -jar %executable% %ags%

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

@@ -9,6 +9,11 @@
 
 import java.io.File;
 
+/**
+ * new version of this class can be found on: https://github.com/swagger-api/swagger-codegen-generators
+ * @deprecated use <code>io.swagger.codegen.languages.html.StaticDocCodegen</code> instead.
+ */
+@Deprecated
 public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig {
     protected String invokerPackage = "io.swagger.client";
     protected String groupId = "io.swagger";

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

@@ -27,6 +27,11 @@
 import io.swagger.v3.oas.models.media.MapSchema;
 import io.swagger.v3.oas.models.media.Schema;
 
+/**
+ * new version of this class can be found on: https://github.com/swagger-api/swagger-codegen-generators
+ * @deprecated use <code>io.swagger.codegen.languages.html.StaticHtmlCodegen</code> instead.
+ */
+@Deprecated
 public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig {
     protected String invokerPackage = "io.swagger.client";
     protected String groupId = "io.swagger";

samples/dynamic-html/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.2.3-SNAPSHOT
+3.0.0-SNAPSHOT

samples/dynamic-html/docs/index.html

@@ -29,47 +29,82 @@ <h1 id="logo"><a class="logo" href="/"><span>Swagger</span><span class="light">A
             <li>Getting Started</li>
           </ul>
         </div>
+
+
         <div class="section-box">
           <div class="section-header">
             <a href="#!/PetApi">PetApi</a>
           </div>
           <ul>
+
+
             <li><a href="#!/PetApi#addPet">addPet</a></li>
+
             <li><a href="#!/PetApi#deletePet">deletePet</a></li>
+
             <li><a href="#!/PetApi#findPetsByStatus">findPetsByStatus</a></li>
+
             <li><a href="#!/PetApi#findPetsByTags">findPetsByTags</a></li>
+
             <li><a href="#!/PetApi#getPetById">getPetById</a></li>
+
             <li><a href="#!/PetApi#updatePet">updatePet</a></li>
+
             <li><a href="#!/PetApi#updatePetWithForm">updatePetWithForm</a></li>
+
             <li><a href="#!/PetApi#uploadFile">uploadFile</a></li>
+
+
           </ul>
         </div>
+
         <div class="section-box">
           <div class="section-header">
             <a href="#!/StoreApi">StoreApi</a>
           </div>
           <ul>
+
+
             <li><a href="#!/StoreApi#deleteOrder">deleteOrder</a></li>
+
             <li><a href="#!/StoreApi#getInventory">getInventory</a></li>
+
             <li><a href="#!/StoreApi#getOrderById">getOrderById</a></li>
+
             <li><a href="#!/StoreApi#placeOrder">placeOrder</a></li>
+
+
           </ul>
         </div>
+
         <div class="section-box">
           <div class="section-header">
             <a href="#!/UserApi">UserApi</a>
           </div>
           <ul>
+
+
             <li><a href="#!/UserApi#createUser">createUser</a></li>
+
             <li><a href="#!/UserApi#createUsersWithArrayInput">createUsersWithArrayInput</a></li>
+
             <li><a href="#!/UserApi#createUsersWithListInput">createUsersWithListInput</a></li>
+
             <li><a href="#!/UserApi#deleteUser">deleteUser</a></li>
+
             <li><a href="#!/UserApi#getUserByName">getUserByName</a></li>
+
             <li><a href="#!/UserApi#loginUser">loginUser</a></li>
+
             <li><a href="#!/UserApi#logoutUser">logoutUser</a></li>
+
             <li><a href="#!/UserApi#updateUser">updateUser</a></li>
+
+
           </ul>
         </div>
+
+
       </div>
     <div class="non-sidebar">
       <div class="main-content">

samples/dynamic-html/docs/models/ApiResponse.html

@@ -1,17 +1,28 @@
 
+
+
 <h2>ApiResponse</h2>
+
 <ul class="parameter">
   <li class="param-required-false">code : Integer
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-false">type : String
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-false">message : String
     <br/>
+
   </li>
 </ul>
+
+
+

samples/dynamic-html/docs/models/Category.html

@@ -1,12 +1,21 @@
 
+
+
 <h2>Category</h2>
+
 <ul class="parameter">
   <li class="param-required-false">id : Long
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-false">name : String
     <br/>
+
   </li>
 </ul>
+
+
+

samples/dynamic-html/docs/models/Order.html

@@ -1,39 +1,61 @@
 
+
+
 <h2>Order</h2>
+
 <ul class="parameter">
   <li class="param-required-false">id : Long
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-false">petId : Long
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-false">quantity : Integer
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-false">shipDate : Date
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-false">status : String
     <br/>Order Status
+
       <dl class="param-enum">
         <dt>Enum:
+
             <dd>placed</dd>
+
             <dd>approved</dd>
+
             <dd>delivered</dd>
+
         </dt>
       </dl>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-false">complete : Boolean
     <br/>
+
   </li>
 </ul>
+
+
+

samples/dynamic-html/docs/models/Pet.html

@@ -1,39 +1,61 @@
 
+
+
 <h2>Pet</h2>
+
 <ul class="parameter">
   <li class="param-required-false">id : Long
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-false">category : Category
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-true">name : String
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-true">photoUrls : List
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-false">tags : List
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-false">status : String
     <br/>pet status in the store
+
       <dl class="param-enum">
         <dt>Enum:
+
             <dd>available</dd>
+
             <dd>pending</dd>
+
             <dd>sold</dd>
+
         </dt>
       </dl>
+
   </li>
 </ul>
+
+
+

samples/dynamic-html/docs/models/Tag.html

@@ -1,12 +1,21 @@
 
+
+
 <h2>Tag</h2>
+
 <ul class="parameter">
   <li class="param-required-false">id : Long
     <br/>
+
   </li>
 </ul>
+
 <ul class="parameter">
   <li class="param-required-false">name : String
     <br/>
+
   </li>
 </ul>
+
+
+