ソースを参照

remove translations, add invalid(SimpleViolationException)

tags/2.0.1
Jonathan Cobb 5年前
コミット
54c0898528
3個のファイルの変更5行の追加5行の削除
  1. +1
    -2
      wizard-server/src/main/java/org/cobbzilla/wizard/exceptionmappers/AbstractConstraintViolationExceptionMapper.java
  2. +1
    -2
      wizard-server/src/main/java/org/cobbzilla/wizard/exceptionmappers/HibernateConstraintViolationExceptionMapper.java
  3. +3
    -1
      wizard-server/src/main/java/org/cobbzilla/wizard/resources/ResourceUtil.java

+ 1
- 2
wizard-server/src/main/java/org/cobbzilla/wizard/exceptionmappers/AbstractConstraintViolationExceptionMapper.java ファイルの表示

@@ -2,7 +2,6 @@ package org.cobbzilla.wizard.exceptionmappers;

import org.cobbzilla.util.http.HttpStatusCodes;
import org.cobbzilla.wizard.validation.ConstraintViolationBean;
import org.cobbzilla.wizard.validation.ValidationMessages;

import javax.validation.ConstraintViolation;
import javax.ws.rs.core.Response;
@@ -21,7 +20,7 @@ public abstract class AbstractConstraintViolationExceptionMapper<E extends Excep
}

protected ConstraintViolationBean mapGenericExceptionToConstraintViolationBean(E e) {
return new ConstraintViolationBean(scrubMessage(e.getMessage()), ValidationMessages.translateMessage(e.getMessage()), getInvalidValue(e));
return new ConstraintViolationBean(scrubMessage(e.getMessage()), e.getMessage(), getInvalidValue(e));
}

protected List<ConstraintViolationBean> getConstraintViolationBeans(List<ConstraintViolation> violations) {


+ 1
- 2
wizard-server/src/main/java/org/cobbzilla/wizard/exceptionmappers/HibernateConstraintViolationExceptionMapper.java ファイルの表示

@@ -1,7 +1,6 @@
package org.cobbzilla.wizard.exceptionmappers;

import org.cobbzilla.wizard.validation.ConstraintViolationBean;
import org.cobbzilla.wizard.validation.ValidationMessages;
import org.hibernate.exception.ConstraintViolationException;

import javax.ws.rs.core.Response;
@@ -23,7 +22,7 @@ public class HibernateConstraintViolationExceptionMapper
@Override
protected List<ConstraintViolationBean> exception2json(ConstraintViolationException e) {
final String messageTemplate = "db.constraint." + e.getConstraintName();
final ConstraintViolationBean bean = new ConstraintViolationBean(messageTemplate, ValidationMessages.translateMessage(messageTemplate), "");
final ConstraintViolationBean bean = new ConstraintViolationBean(messageTemplate, messageTemplate, "");
return Collections.singletonList(bean);
}
}

+ 3
- 1
wizard-server/src/main/java/org/cobbzilla/wizard/resources/ResourceUtil.java ファイルの表示

@@ -138,7 +138,7 @@ public class ResourceUtil {
public static Response invalid(String messageTemplate) { return invalid(messageTemplate, null); }

public static Response invalid(String messageTemplate, String invalidValue) {
return invalid(messageTemplate, ValidationMessages.translateMessage(messageTemplate), invalidValue);
return invalid(messageTemplate, messageTemplate, invalidValue);
}

public static Response invalid(String messageTemplate, String message, String invalidValue) {
@@ -147,6 +147,8 @@ public class ResourceUtil {
return invalid(violations);
}

public static Response invalid(SimpleViolationException e) { return invalid(e.getBean()); }

public static Response invalid(ValidationResult result) { return invalid(result.getViolationBeans()); }

public static SimpleViolationException invalidEx(String messageTemplate) { return invalidEx(messageTemplate, null, null); }


読み込み中…
キャンセル
保存