Skip to content

Commit 88d2880

Browse files
committed
WebUserController: using camel case
1 parent a605705 commit 88d2880

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/main/java/de/rwth/idsg/steve/web/controller/WebUsersController.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public class WebUsersController {
4848

4949
private static final String QUERY_PATH = "/query";
5050

51-
private static final String DETAILS_PATH = "/details/{webuserpk}";
52-
private static final String DELETE_ALL_PATH = "/delete/{webuserpk}";
51+
private static final String DETAILS_PATH = "/details/{webUserPk}";
52+
private static final String DELETE_ALL_PATH = "/delete/{webUserPk}";
5353
private static final String UPDATE_PATH = "/update";
5454
private static final String ADD_PATH = "/add";
5555

@@ -75,8 +75,8 @@ private void initList(Model model, WebUserQueryForm params) {
7575
}
7676

7777
@RequestMapping(value = DETAILS_PATH, method = RequestMethod.GET)
78-
public String getDetails(@PathVariable("webuserpk") Integer webuserpk, Model model) {
79-
WebUserForm form = webUserService.getDetails(webuserpk);
78+
public String getDetails(@PathVariable("webUserPk") Integer webUserPk, Model model) {
79+
WebUserForm form = webUserService.getDetails(webUserPk);
8080

8181
model.addAttribute("webuserForm", form);
8282
return "data-man/webuserDetails";
@@ -97,24 +97,24 @@ public String addPost(@Valid @ModelAttribute("webuserForm") WebUserForm webuserF
9797

9898
// password is Null, Blank/Empty or less than 8 Characters then don't add and show an Error
9999
if (webuserForm.getPassword() == null) {
100-
webuserForm.setPwerror(Boolean.TRUE);
100+
webuserForm.setPwError(Boolean.TRUE);
101101
return "data-man/webuserAdd";
102102

103103
}
104104

105105
if ((webuserForm.getPassword().length() < 8) | webuserForm.getPassword().isBlank())
106106
/* | webuserForm.getPassword().isEmpty() in isBlank included */ {
107-
webuserForm.setPwerror(Boolean.TRUE);
107+
webuserForm.setPwError(Boolean.TRUE);
108108
return "data-man/webuserAdd";
109109
}
110110

111111
// Compare both the password inputs
112112
if (!webuserForm.getPassword().equals(webuserForm.getPasswordComparison())) {
113-
webuserForm.setPwerror(Boolean.TRUE);
113+
webuserForm.setPwError(Boolean.TRUE);
114114
return "data-man/webuserAdd";
115115
}
116116

117-
webuserForm.setPwerror(Boolean.FALSE);
117+
webuserForm.setPwError(Boolean.FALSE);
118118

119119
webUserService.add(webuserForm);
120120
return toOverview();
@@ -129,13 +129,13 @@ public String update(@Valid @ModelAttribute("webuserForm") WebUserForm webuserFo
129129

130130
if (webuserForm.getPassword() != null) {
131131
if (!webuserForm.getPassword().equals(webuserForm.getPasswordComparison())) {
132-
webuserForm.setPwerror(Boolean.TRUE);
132+
webuserForm.setPwError(Boolean.TRUE);
133133
return "data-man/webuserDetails";
134134
}
135135
// password is Blank or less than 8 Characters then don't update and show an Error
136136
// --> WebUserRepositoryImpl: Null and Empty update without updating the password
137137
if (webuserForm.getPassword().isBlank() | webuserForm.getPassword().length() < 8) {
138-
webuserForm.setPwerror(Boolean.TRUE);
138+
webuserForm.setPwError(Boolean.TRUE);
139139
return "data-man/webuserDetails";
140140
}
141141
}
@@ -145,8 +145,8 @@ public String update(@Valid @ModelAttribute("webuserForm") WebUserForm webuserFo
145145
}
146146

147147
@RequestMapping(value = DELETE_ALL_PATH, method = RequestMethod.POST)
148-
public String delete(@PathVariable("webuserpk") Integer webuserpk) {
149-
webUserService.deleteUser(webuserpk);
148+
public String delete(@PathVariable("webUserPk") Integer webUserPk) {
149+
webUserService.deleteUser(webUserPk);
150150
return toOverview();
151151
}
152152

0 commit comments

Comments
 (0)