zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade Spring version.

Browse Source 
Fix failing export tests
This commit is contained in:
Paulo Veiga
2018-09-14 17:50:27 -07:00
parent 57b2e79c0d
commit 4234ca7e38
30 changed files with 187 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wise-webapp/src/main/java/com/wisemapping/validator/Messages.java
View File

@@ -26,6 +26,5 @@ public interface Messages {
String MAP_TITLE_ALREADY_EXISTS = "MAP_TITLE_ALREADY_EXISTS";
String LABEL_TITLE_ALREADY_EXISTS = "LABEL_TITLE_ALREADY_EXISTS";
String PASSWORD_MISSMATCH = "PASSWORD_MISSMATCH";
String CAPTCHA_ERROR = "CAPTCHA_ERROR";
String CAPTCHA_LOADING_ERROR = "CAPTCHA_LOADING_ERROR";
}

8
wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java
View File

@@ -18,10 +18,10 @@
package com.wisemapping.validator;
import com.wisemapping.service.RecaptchaService;
import com.wisemapping.service.UserService;
import com.wisemapping.view.UserBean;
import com.wisemapping.model.Constants;
import net.tanesha.recaptcha.ReCaptcha;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.validation.Errors;
@@ -32,7 +32,7 @@ public class UserValidator
implements Validator {
private UserService userService;
private ReCaptcha captchaService;
private RecaptchaService captchaService;
public boolean supports(final Class clazz) {
@@ -92,11 +92,11 @@ public class UserValidator
this.userService = userService;
}
public void setCaptchaService(@NotNull final ReCaptcha captchaService) {
public void setCaptchaService(@NotNull final RecaptchaService captchaService) {
this.captchaService = captchaService;
}
public ReCaptcha getCaptchaService() {
public RecaptchaService getCaptchaService() {
return captchaService;
}
}