Skip to content

Commit f4ffabf

Browse files
wikumChamithwikumChamith
authored
LU-181: Include suffix in controller urls (#67)
1 parent 356df07 commit f4ffabf

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

‎omod/src/main/java/org/openmrs/module/metadatasharing/web/controller/ExportController.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public class ExportController {
111111
@Autowired
112112
private JsonObjectView jsonView;
113113

114-
@RequestMapping(LIST_PATH)
114+
@RequestMapping(LIST_PATH + ".form")
115115
public void list(Model model) {
116116
List<ExportedPackageSummary> packages = getService().getAllExportedPackageSummaries();
117117
Map<String, ExportedPackageSummary> latestVersion = new HashMap<String, ExportedPackageSummary>();
@@ -153,7 +153,7 @@ public void list(Model model) {
153153
* Gets all packages with the given group and passes to the model (they will be rendered in .jsp
154154
* page)
155155
*/
156-
@RequestMapping(DETAILS_PATH)
156+
@RequestMapping(DETAILS_PATH + ".form")
157157
public String details(String group, Model model) {
158158
List<ExportedPackageSummary> packages = new ArrayList<ExportedPackageSummary>();
159159
for (ExportedPackageSummary summary : getService().getAllExportedPackageSummaries()) {
@@ -174,7 +174,7 @@ public String details(String group, Model model) {
174174
}
175175
}
176176

177-
@RequestMapping(DELETE_PATH)
177+
@RequestMapping(DELETE_PATH + ".form")
178178
public String delete(Integer id, Model model) {
179179
ExportedPackage pack = MetadataSharing.getService().getExportedPackageById(id);
180180
if (pack != null) {
@@ -206,22 +206,22 @@ public String togglePublished(Integer id, Model model) {
206206
}
207207
}
208208

209-
@RequestMapping(DOWNLOAD_PATH)
209+
@RequestMapping(DOWNLOAD_PATH + ".form")
210210
public ModelAndView download(Integer id, Model model) {
211211
ExportedPackage pack = MetadataSharing.getService().getExportedPackageById(id);
212212
model.addAttribute("package", pack);
213213
return new ModelAndView(downloadPackageView);
214214
}
215215

216-
@RequestMapping(value = CREATE_PATH, method = RequestMethod.GET)
216+
@RequestMapping(value = CREATE_PATH + ".form", method = RequestMethod.GET)
217217
public void create(Model model) {
218218
if (!model.containsAttribute(EXPORTER)) {
219219
model.addAttribute(EXPORTER, MetadataSharing.getInstance().newPackageExporter());
220220
}
221221
model.addAttribute("publishConfigured", MetadataSharing.getInstance().isPublishConfigured());
222222
}
223223

224-
@RequestMapping(value = UPGRADE_PATH)
224+
@RequestMapping(value = UPGRADE_PATH + ".form")
225225
public String upgrade(Integer id, Boolean empty, Model model) throws SerializationException, IOException {
226226
ExportedPackage exportedPackage = MetadataSharing.getService().getExportedPackageById(id);
227227
PackageVersioner versioner = null;
@@ -257,7 +257,7 @@ public String upgrade(Integer id, Boolean empty, Model model) throws Serializati
257257
return WebUtils.redirect(CREATE_PATH);
258258
}
259259

260-
@RequestMapping(value = CREATE_PATH, method = RequestMethod.POST)
260+
@RequestMapping(value = CREATE_PATH + ".form", method = RequestMethod.POST)
261261
public String create(@ModelAttribute(EXPORTER)
262262
PackageExporter exporter, Errors errors, Model model) {
263263
model.addAttribute("publishConfigured", MetadataSharing.getInstance().isPublishConfigured());
@@ -279,11 +279,11 @@ public String create(@ModelAttribute(EXPORTER)
279279
}
280280
}
281281

282-
@RequestMapping(value = EDIT_PATH)
282+
@RequestMapping(value = EDIT_PATH + ".form")
283283
public void edit() {
284284
}
285285

286-
@RequestMapping(value = ADD_ALL_ITEMS_PATH)
286+
@RequestMapping(value = ADD_ALL_ITEMS_PATH + ".form")
287287
public String addAllItems(@ModelAttribute(PACKAGE_ITEMS)
288288
PackageItems packageItems, String type, Boolean includeRetired) {
289289
if (includeRetired) {
@@ -302,15 +302,15 @@ public String addAllItems(@ModelAttribute(PACKAGE_ITEMS)
302302
return WebUtils.redirect(EDIT_PATH);
303303
}
304304

305-
@RequestMapping(value = REMOVE_ALL_ITEMS_PATH)
305+
@RequestMapping(value = REMOVE_ALL_ITEMS_PATH + ".form")
306306
public String removeAllItems(@ModelAttribute(PACKAGE_ITEMS)
307307
PackageItems packageItems, String type) {
308308
packageItems.getCompleteTypes().remove(type);
309309
packageItems.getItems().remove(type);
310310
return WebUtils.redirect(EDIT_PATH);
311311
}
312312

313-
@RequestMapping(value = SELECT_ITEMS_PATH, method = RequestMethod.GET)
313+
@RequestMapping(value = SELECT_ITEMS_PATH + ".form", method = RequestMethod.GET)
314314
public void selectItems(@RequestParam(required = false)
315315
String type, Model model) {
316316
if (type == null) {
@@ -322,7 +322,7 @@ public void selectItems(@RequestParam(required = false)
322322
// Items will be fetched with JSON.
323323
}
324324

325-
@RequestMapping(value = SELECT_ITEMS_PATH, method = RequestMethod.POST)
325+
@RequestMapping(value = SELECT_ITEMS_PATH + ".form", method = RequestMethod.POST)
326326
public String selectItems(@ModelAttribute(PACKAGE_ITEMS)
327327
PackageItems packageItems, String type, HttpServletRequest request) {
328328
String[] addUuids = request.getParameterValues("addUuids");
@@ -372,7 +372,7 @@ public String selectItems(@ModelAttribute(PACKAGE_ITEMS)
372372
return WebUtils.redirect(EDIT_PATH);
373373
}
374374

375-
@RequestMapping(JSON_ITEMS_PATH)
375+
@RequestMapping(JSON_ITEMS_PATH + ".form`")
376376
public ModelAndView jsonItems(@ModelAttribute(PACKAGE_ITEMS)
377377
PackageItems packageItems, String type, HttpServletRequest httpRequest, Model model) throws IOException {
378378
DatatablesRequest request = DatatablesRequest.parseRequest(httpRequest);
@@ -421,7 +421,7 @@ public ModelAndView jsonItems(@ModelAttribute(PACKAGE_ITEMS)
421421
return new ModelAndView(jsonView);
422422
}
423423

424-
@RequestMapping(value = COMPLETE_PATH, method = RequestMethod.POST)
424+
@RequestMapping(value = COMPLETE_PATH + ".form", method = RequestMethod.POST)
425425
public String complete(@ModelAttribute(EXPORTER)
426426
PackageExporter exporter, Errors errors, @ModelAttribute(PACKAGE_ITEMS)
427427
PackageItems packageItems, Model model, SessionStatus session) {

‎omod/src/main/java/org/openmrs/module/metadatasharing/web/controller/ImportController.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,12 @@ public class ImportController {
153153
@Autowired
154154
private SubscriptionUpdater updater;
155155

156-
@RequestMapping(LIST_PATH)
156+
@RequestMapping(LIST_PATH + ".form")
157157
public void list(Model model) {
158158
model.addAttribute("subscriptions", MetadataSharing.getService().getAllImportedPackages());
159159
}
160160

161-
@RequestMapping(value = TOGGLE_SUBSCRIBE_PATH, method = RequestMethod.GET)
161+
@RequestMapping(value = TOGGLE_SUBSCRIBE_PATH + ".form", method = RequestMethod.GET)
162162
public String toggleSubscribe(Integer id) {
163163
ImportedPackage importedPackage = MetadataSharing.getService().getImportedPackageById(id);
164164
if (importedPackage != null) {
@@ -172,7 +172,7 @@ public String toggleSubscribe(Integer id) {
172172
return WebUtils.redirect(LIST_PATH);
173173
}
174174

175-
@RequestMapping(value = DELETE_SUBSCRIBE_PATH, method = RequestMethod.GET)
175+
@RequestMapping(value = DELETE_SUBSCRIBE_PATH + ".form", method = RequestMethod.GET)
176176
public String purgeSubscribe(Integer id) {
177177
ImportedPackage importedPackage = MetadataSharing.getService().getImportedPackageById(id);
178178
if (importedPackage != null) {
@@ -182,7 +182,7 @@ public String purgeSubscribe(Integer id) {
182182
}
183183

184184

185-
@RequestMapping(value = JSON_CHECK_UPDATES_PATH, method = RequestMethod.GET)
185+
@RequestMapping(value = JSON_CHECK_UPDATES_PATH + ".form", method = RequestMethod.GET)
186186
public ModelAndView jsonCheckUpdates(Integer id, ModelMap model) {
187187
ImportedPackage importedPackage = MetadataSharing.getService().getImportedPackageById(id);
188188
if (importedPackage != null && importedPackage.isSubscribed()) {
@@ -263,12 +263,12 @@ public ModelAndView jsonPerformDownload(@ModelAttribute(DOWNLOADER)
263263
return new ModelAndView(jsonObjectView);
264264
}
265265

266-
@RequestMapping(value = UPLOAD_PATH, method = RequestMethod.GET)
266+
@RequestMapping(value = UPLOAD_PATH + ".form", method = RequestMethod.GET)
267267
public void upload(SessionStatus status) {
268268
status.setComplete();
269269
}
270270

271-
@RequestMapping(value = UPLOAD_PATH, method = RequestMethod.POST)
271+
@RequestMapping(value = UPLOAD_PATH + ".form", method = RequestMethod.POST)
272272
public String uploadPOST(UploadForm uploadForm, Errors errors, Model model) throws IOException {
273273
uploadFormValidator.validate(uploadForm, errors);
274274
if (errors.hasErrors()) {
@@ -315,13 +315,13 @@ public String uploadPOST(UploadForm uploadForm, Errors errors, Model model) thro
315315
}
316316
}
317317

318-
@RequestMapping(value = VALIDATE_PATH, method = RequestMethod.GET)
318+
@RequestMapping(value = VALIDATE_PATH + ".form", method = RequestMethod.GET)
319319
public void validate(@ModelAttribute(IMPORTER)
320320
PackageImporter importer, Errors errors) throws SerializationException {
321321
packageContainerValidator.validateForErrorsAndWarnings(importer, errors);
322322
}
323323

324-
@RequestMapping(value = VALIDATE_PATH, method = RequestMethod.POST)
324+
@RequestMapping(value = VALIDATE_PATH + ".form", method = RequestMethod.POST)
325325
public String validatePOST(@ModelAttribute(IMPORTER)
326326
PackageImporter importer, Errors errors) {
327327
packageContainerValidator.validate(importer, errors);
@@ -333,11 +333,11 @@ public String validatePOST(@ModelAttribute(IMPORTER)
333333
}
334334
}
335335

336-
@RequestMapping(value = MODE_PATH, method = RequestMethod.GET)
336+
@RequestMapping(value = MODE_PATH + ".form", method = RequestMethod.GET)
337337
public void mode() {
338338
}
339339

340-
@RequestMapping(value = MODE_PATH, method = RequestMethod.POST)
340+
@RequestMapping(value = MODE_PATH + ".form", method = RequestMethod.POST)
341341
public String modePOST(@ModelAttribute(IMPORTER)
342342
PackageImporter importer, String importMode) {
343343
ImportMode mode = ImportMode.valueOf(importMode);
@@ -354,12 +354,12 @@ public String modePOST(@ModelAttribute(IMPORTER)
354354
return WebUtils.redirect(CONFIG_PATH);
355355
}
356356

357-
@RequestMapping(value = CONFIG_PATH, method = RequestMethod.GET)
357+
@RequestMapping(value = CONFIG_PATH + ".form", method = RequestMethod.GET)
358358
public void config(@ModelAttribute(IMPORTER)
359359
PackageImporter importer) {
360360
}
361361

362-
@RequestMapping(value = CONFIG_PATH, method = RequestMethod.POST)
362+
@RequestMapping(value = CONFIG_PATH + ".form", method = RequestMethod.POST)
363363
public String configPOST(@ModelAttribute(IMPORTER)
364364
PackageImporter importer, Model model) throws IOException {
365365
ImportedPackage importedPackage = MetadataSharing.getService().getImportedPackageByGroup(
@@ -380,7 +380,7 @@ public String configPOST(@ModelAttribute(IMPORTER)
380380
return WebUtils.redirect(LOAD_PATH);
381381
}
382382

383-
@RequestMapping(value = LOAD_PATH, params = "part")
383+
@RequestMapping(value = LOAD_PATH + ".form", params = "part")
384384
public String load(@ModelAttribute(IMPORTER)
385385
PackageImporter importer, @ModelAttribute(PARTS)
386386
Map<Integer, Boolean> parts, Integer part, Model model) {
@@ -412,7 +412,7 @@ public String load(@ModelAttribute(IMPORTER)
412412
}
413413
}
414414

415-
@RequestMapping(LOAD_PATH)
415+
@RequestMapping(LOAD_PATH + ".form")
416416
public String load(@ModelAttribute(IMPORTER)
417417
PackageImporter importer, @ModelAttribute(ITEMS_STATS)
418418
ImportedItemsStats stats, @ModelAttribute(PARTS)
@@ -429,7 +429,7 @@ public String load(@ModelAttribute(IMPORTER)
429429
return VIEW_PATH;
430430
}
431431

432-
@RequestMapping(VIEW_PATH)
432+
@RequestMapping(VIEW_PATH + ".form")
433433
public void view(@ModelAttribute(IMPORTER)
434434
PackageImporter importer, @ModelAttribute(ITEMS_STATS)
435435
ImportedItemsStats stats, @ModelAttribute(PARTS)
@@ -444,7 +444,7 @@ public void view(@ModelAttribute(IMPORTER)
444444
model.addAttribute(ITEMS_STATS, itemsStats);
445445
}
446446

447-
@RequestMapping(value = COMPLETE_PATH)
447+
@RequestMapping(value = COMPLETE_PATH + ".form")
448448
public String complete(@ModelAttribute(IMPORTER)
449449
PackageImporter importer, Errors errors, Model model, SessionStatus session) {
450450
Task task = importer.schedulePackageImport();
@@ -573,7 +573,7 @@ public void assessItem(@ModelAttribute(ITEMS)
573573
model.addAttribute(assessItemForm);
574574
}
575575

576-
@RequestMapping(value = ITEM_PATH, method = RequestMethod.GET, params = "uuid")
576+
@RequestMapping(value = ITEM_PATH + ".form", method = RequestMethod.GET, params = "uuid")
577577
public void assessItem(@ModelAttribute(ITEMS)
578578
List<ImportedItem> items, Integer index, String uuid, Model model) {
579579
ImportedItem importedItem = items.get(index);
@@ -589,7 +589,7 @@ public void assessItem(@ModelAttribute(ITEMS)
589589
assessItem(items, index, model);
590590
}
591591

592-
@RequestMapping(value = ITEM_PATH, method = RequestMethod.POST)
592+
@RequestMapping(value = ITEM_PATH + ".form", method = RequestMethod.POST)
593593
public String assessItemPOST(@ModelAttribute(ITEMS)
594594
List<ImportedItem> items, AssessItemForm assessItemForm, Model model) {
595595
ImportedItem importedItem = items.get(assessItemForm.getIndex());

‎omod/src/main/java/org/openmrs/module/metadatasharing/web/controller/TaskController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class TaskController {
4545
@Autowired
4646
private TaskEngine taskEngine;
4747

48-
@RequestMapping(value = LIST_PATH)
48+
@RequestMapping(value = LIST_PATH + ".form")
4949
public void list(Model model) {
5050
model.addAttribute(TASKS, taskEngine.getTasks());
5151
}
@@ -56,7 +56,7 @@ public String remove(String uuid, HttpSession session) {
5656
return WebUtils.redirect(LIST_PATH);
5757
}
5858

59-
@RequestMapping(value = DETAILS_PATH)
59+
@RequestMapping(value = DETAILS_PATH + ".form")
6060
public void details(String uuid, Model model) {
6161
Task task = taskEngine.getTask(uuid);
6262
model.addAttribute(TASK, task);

0 commit comments

Comments
 (0)