|
19 | 19 | import com.fasterxml.jackson.databind.ObjectMapper;
|
20 | 20 | import net.winroad.wrdoclet.AbstractDoclet;
|
21 | 21 | import net.winroad.wrdoclet.data.OpenAPI;
|
| 22 | +import net.winroad.wrdoclet.data.RequestMapping; |
22 | 23 | import net.winroad.wrdoclet.data.WRDoc;
|
23 | 24 | import net.winroad.wrdoclet.doc.API;
|
24 | 25 | import net.winroad.wrdoclet.doc.Doc;
|
@@ -110,10 +111,7 @@ protected DocData generateDocData(WRDoc wrDoc) {
|
110 | 111 | api.setUrl(openAPI.getRequestMapping().getUrl());
|
111 | 112 | api.setTooltip(openAPI.getRequestMapping().getTooltip());
|
112 | 113 | 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()); |
117 | 115 | api.setFilepath(filename);
|
118 | 116 | api.setBrief(openAPI.getBrief());
|
119 | 117 | doc.getAPIs().add(api);
|
@@ -225,18 +223,6 @@ protected void generateCommonFiles(RootDoc root) throws Exception {
|
225 | 223 | Util.combineFilePath(this.configurationEx.destDirName, "img"));
|
226 | 224 | }
|
227 | 225 |
|
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 |
| - |
240 | 226 | /**
|
241 | 227 | * Generate the tag documentation.
|
242 | 228 | *
|
@@ -281,10 +267,7 @@ protected void generateWRAPIDetailFiles(RootDoc root, WRDoc wrDoc) {
|
281 | 267 | this.configurationEx.buildid);
|
282 | 268 | }
|
283 | 269 | 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()); |
288 | 271 | hashMap.put("filePath", filename);
|
289 | 272 | if (!filesGenerated.contains(filename)) {
|
290 | 273 | this.configurationEx
|
|
0 commit comments