Skip to content

Commit 1d60f52

Browse files
authored
Merge pull request #7830 from jmini/patch-10
[3.0.0] Clean up tasks for "html" and "dynamic-html"
2 parents e59a9cf + 8ac17b2 commit 1d60f52

File tree

23 files changed

+987
-433
lines changed

23 files changed

+987
-433
lines changed

bin/dynamic-html.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ fi
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
2929
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l dynamic-html -o samples/dynamic-html"
3030

31-
# java $JAVA_OPTS -jar $executable $ags
31+
java $JAVA_OPTS -jar $executable $ags

bin/html-markdown.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ fi
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
2929
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/markdown.yaml -l html -o samples/html.md"
3030

31-
# java $JAVA_OPTS -jar $executable $ags
31+
java $JAVA_OPTS -jar $executable $ags

bin/html-petstore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ fi
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
2929
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l html -o samples/html"
3030

31-
# java $JAVA_OPTS -jar $executable $ags
31+
java $JAVA_OPTS -jar $executable $ags

bin/windows/dynamic-html-petstore.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ If Not Exist %executable% (
77
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
88
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l dynamic-html -o samples\client\petstore\dynamic-html
99

10-
REM java %JAVA_OPTS% -jar %executable% %ags%
10+
java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/html-petstore.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ If Not Exist %executable% (
77
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
88
set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l html -o samples\client\petstore\html
99

10-
REM java %JAVA_OPTS% -jar %executable% %ags%
10+
java %JAVA_OPTS% -jar %executable% %ags%

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99

1010
import java.io.File;
1111

12+
/**
13+
* new version of this class can be found on: https://github.com/swagger-api/swagger-codegen-generators
14+
* @deprecated use <code>io.swagger.codegen.languages.html.StaticDocCodegen</code> instead.
15+
*/
16+
@Deprecated
1217
public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig {
1318
protected String invokerPackage = "io.swagger.client";
1419
protected String groupId = "io.swagger";

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
import io.swagger.v3.oas.models.media.MapSchema;
2828
import io.swagger.v3.oas.models.media.Schema;
2929

30+
/**
31+
* new version of this class can be found on: https://github.com/swagger-api/swagger-codegen-generators
32+
* @deprecated use <code>io.swagger.codegen.languages.html.StaticHtmlCodegen</code> instead.
33+
*/
34+
@Deprecated
3035
public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig {
3136
protected String invokerPackage = "io.swagger.client";
3237
protected String groupId = "io.swagger";
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.3-SNAPSHOT
1+
3.0.0-SNAPSHOT
-8.76 KB
Loading

samples/dynamic-html/docs/index.html

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,47 +29,82 @@ <h1 id="logo"><a class="logo" href="/"><span>Swagger</span><span class="light">A
2929
<li>Getting Started</li>
3030
</ul>
3131
</div>
32+
33+
3234
<div class="section-box">
3335
<div class="section-header">
3436
<a href="#!/PetApi">PetApi</a>
3537
</div>
3638
<ul>
39+
40+
3741
<li><a href="#!/PetApi#addPet">addPet</a></li>
42+
3843
<li><a href="#!/PetApi#deletePet">deletePet</a></li>
44+
3945
<li><a href="#!/PetApi#findPetsByStatus">findPetsByStatus</a></li>
46+
4047
<li><a href="#!/PetApi#findPetsByTags">findPetsByTags</a></li>
48+
4149
<li><a href="#!/PetApi#getPetById">getPetById</a></li>
50+
4251
<li><a href="#!/PetApi#updatePet">updatePet</a></li>
52+
4353
<li><a href="#!/PetApi#updatePetWithForm">updatePetWithForm</a></li>
54+
4455
<li><a href="#!/PetApi#uploadFile">uploadFile</a></li>
56+
57+
4558
</ul>
4659
</div>
60+
4761
<div class="section-box">
4862
<div class="section-header">
4963
<a href="#!/StoreApi">StoreApi</a>
5064
</div>
5165
<ul>
66+
67+
5268
<li><a href="#!/StoreApi#deleteOrder">deleteOrder</a></li>
69+
5370
<li><a href="#!/StoreApi#getInventory">getInventory</a></li>
71+
5472
<li><a href="#!/StoreApi#getOrderById">getOrderById</a></li>
73+
5574
<li><a href="#!/StoreApi#placeOrder">placeOrder</a></li>
75+
76+
5677
</ul>
5778
</div>
79+
5880
<div class="section-box">
5981
<div class="section-header">
6082
<a href="#!/UserApi">UserApi</a>
6183
</div>
6284
<ul>
85+
86+
6387
<li><a href="#!/UserApi#createUser">createUser</a></li>
88+
6489
<li><a href="#!/UserApi#createUsersWithArrayInput">createUsersWithArrayInput</a></li>
90+
6591
<li><a href="#!/UserApi#createUsersWithListInput">createUsersWithListInput</a></li>
92+
6693
<li><a href="#!/UserApi#deleteUser">deleteUser</a></li>
94+
6795
<li><a href="#!/UserApi#getUserByName">getUserByName</a></li>
96+
6897
<li><a href="#!/UserApi#loginUser">loginUser</a></li>
98+
6999
<li><a href="#!/UserApi#logoutUser">logoutUser</a></li>
100+
70101
<li><a href="#!/UserApi#updateUser">updateUser</a></li>
102+
103+
71104
</ul>
72105
</div>
106+
107+
73108
</div>
74109
<div class="non-sidebar">
75110
<div class="main-content">

0 commit comments

Comments
 (0)