@@ -48,8 +48,8 @@ public class WebUsersController {
48
48
49
49
private static final String QUERY_PATH = "/query" ;
50
50
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 }" ;
53
53
private static final String UPDATE_PATH = "/update" ;
54
54
private static final String ADD_PATH = "/add" ;
55
55
@@ -75,8 +75,8 @@ private void initList(Model model, WebUserQueryForm params) {
75
75
}
76
76
77
77
@ 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 );
80
80
81
81
model .addAttribute ("webuserForm" , form );
82
82
return "data-man/webuserDetails" ;
@@ -97,24 +97,24 @@ public String addPost(@Valid @ModelAttribute("webuserForm") WebUserForm webuserF
97
97
98
98
// password is Null, Blank/Empty or less than 8 Characters then don't add and show an Error
99
99
if (webuserForm .getPassword () == null ) {
100
- webuserForm .setPwerror (Boolean .TRUE );
100
+ webuserForm .setPwError (Boolean .TRUE );
101
101
return "data-man/webuserAdd" ;
102
102
103
103
}
104
104
105
105
if ((webuserForm .getPassword ().length () < 8 ) | webuserForm .getPassword ().isBlank ())
106
106
/* | webuserForm.getPassword().isEmpty() in isBlank included */ {
107
- webuserForm .setPwerror (Boolean .TRUE );
107
+ webuserForm .setPwError (Boolean .TRUE );
108
108
return "data-man/webuserAdd" ;
109
109
}
110
110
111
111
// Compare both the password inputs
112
112
if (!webuserForm .getPassword ().equals (webuserForm .getPasswordComparison ())) {
113
- webuserForm .setPwerror (Boolean .TRUE );
113
+ webuserForm .setPwError (Boolean .TRUE );
114
114
return "data-man/webuserAdd" ;
115
115
}
116
116
117
- webuserForm .setPwerror (Boolean .FALSE );
117
+ webuserForm .setPwError (Boolean .FALSE );
118
118
119
119
webUserService .add (webuserForm );
120
120
return toOverview ();
@@ -129,13 +129,13 @@ public String update(@Valid @ModelAttribute("webuserForm") WebUserForm webuserFo
129
129
130
130
if (webuserForm .getPassword () != null ) {
131
131
if (!webuserForm .getPassword ().equals (webuserForm .getPasswordComparison ())) {
132
- webuserForm .setPwerror (Boolean .TRUE );
132
+ webuserForm .setPwError (Boolean .TRUE );
133
133
return "data-man/webuserDetails" ;
134
134
}
135
135
// password is Blank or less than 8 Characters then don't update and show an Error
136
136
// --> WebUserRepositoryImpl: Null and Empty update without updating the password
137
137
if (webuserForm .getPassword ().isBlank () | webuserForm .getPassword ().length () < 8 ) {
138
- webuserForm .setPwerror (Boolean .TRUE );
138
+ webuserForm .setPwError (Boolean .TRUE );
139
139
return "data-man/webuserDetails" ;
140
140
}
141
141
}
@@ -145,8 +145,8 @@ public String update(@Valid @ModelAttribute("webuserForm") WebUserForm webuserFo
145
145
}
146
146
147
147
@ 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 );
150
150
return toOverview ();
151
151
}
152
152
0 commit comments