Skip to content

Commit 09d590d

Browse files
committed
add feature for headers params consumes of RequestMapping
1 parent c89cfc1 commit 09d590d

File tree

2 files changed

+5
-22
lines changed

2 files changed

+5
-22
lines changed

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<connection>scm:git:git@github.com:WinRoad-NET/htmldoclet4jdk7.git</connection>
3636
<developerConnection>scm:git:git@github.com:WinRoad-NET/htmldoclet4jdk7.git</developerConnection>
3737
<url>https://github.com/WinRoad-NET/htmldoclet4jdk7</url>
38-
<tag>v1.1.0</tag>
38+
<tag>v1.2.1</tag>
3939
</scm>
4040

4141
<issueManagement>
@@ -177,7 +177,7 @@
177177
<dependency>
178178
<groupId>net.winroad</groupId>
179179
<artifactId>wrdocletbase</artifactId>
180-
<version>1.2.0</version>
180+
<version>1.2.1</version>
181181
</dependency>
182182
<dependency>
183183
<groupId>com.google.code.gson</groupId>

src/main/java/net/winroad/htmldoclet4jdk7/HtmlDoclet.java

+3-20
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.fasterxml.jackson.databind.ObjectMapper;
2020
import net.winroad.wrdoclet.AbstractDoclet;
2121
import net.winroad.wrdoclet.data.OpenAPI;
22+
import net.winroad.wrdoclet.data.RequestMapping;
2223
import net.winroad.wrdoclet.data.WRDoc;
2324
import net.winroad.wrdoclet.doc.API;
2425
import net.winroad.wrdoclet.doc.Doc;
@@ -110,10 +111,7 @@ protected DocData generateDocData(WRDoc wrDoc) {
110111
api.setUrl(openAPI.getRequestMapping().getUrl());
111112
api.setTooltip(openAPI.getRequestMapping().getTooltip());
112113
api.setMethodType(openAPI.getRequestMapping().getMethodType());
113-
String filename = generateWRAPIFileName(openAPI
114-
.getRequestMapping().getContainerName(), openAPI
115-
.getRequestMapping().getUrl(), openAPI
116-
.getRequestMapping().getMethodType());
114+
String filename = generateWRAPIFileName(openAPI.getRequestMapping());
117115
api.setFilepath(filename);
118116
api.setBrief(openAPI.getBrief());
119117
doc.getAPIs().add(api);
@@ -225,18 +223,6 @@ protected void generateCommonFiles(RootDoc root) throws Exception {
225223
Util.combineFilePath(this.configurationEx.destDirName, "img"));
226224
}
227225

228-
protected String generateWRAPIFileName(String container, String url,
229-
String methodType) {
230-
return StringUtils.strip(
231-
(container + '-' + url + (methodType == null ? '-'
232-
: '-' + methodType + '-')).replace('/', '-')
233-
.replace('\\', '-').replace(':', '-').replace('*', '-')
234-
.replace('?', '-').replace('"', '-').replace('<', '-')
235-
.replace('>', '-').replace('|', '-').replace('{', '-')
236-
.replace('}', '-'), "-")
237-
+ ".html";
238-
}
239-
240226
/**
241227
* Generate the tag documentation.
242228
*
@@ -281,10 +267,7 @@ protected void generateWRAPIDetailFiles(RootDoc root, WRDoc wrDoc) {
281267
this.configurationEx.buildid);
282268
}
283269
this.logger.info("buildid:" + hashMap.get("buildID"));
284-
String filename = generateWRAPIFileName(openAPI
285-
.getRequestMapping().getContainerName(), openAPI
286-
.getRequestMapping().getUrl(), openAPI
287-
.getRequestMapping().getMethodType());
270+
String filename = generateWRAPIFileName(openAPI.getRequestMapping());
288271
hashMap.put("filePath", filename);
289272
if (!filesGenerated.contains(filename)) {
290273
this.configurationEx

0 commit comments

Comments
 (0)