lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-20 19:46:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化验证器逻辑

Browse Source
This commit is contained in:
zhouhao
2017-06-21 15:55:25 +08:00
parent a7a83625bc
commit 2596e456fc
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/AbstractService.java
View File

@@ -1,16 +1,19 @@
package org.hswebframework.web.service;
import org.hswebframework.utils.ClassUtils;
import org.hswebframework.web.NotFoundException;
import org.hswebframework.web.commons.entity.Entity;
import org.hswebframework.web.commons.entity.factory.EntityFactory;
import org.hswebframework.web.validate.SimpleValidateResults;
import org.hswebframework.web.validate.ValidationException;
import org.hswebframework.utils.ClassUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
import java.util.Set;
import java.util.function.Supplier;
/**
* 抽象服务类,提供通用模板方法、类,如验证器,实体工厂等
@@ -95,13 +98,26 @@ public abstract class AbstractService<E extends Entity, PK> implements CreateEnt
}
}
protected void tryValidate(Object data) {
protected void tryValidate(Object data, String property, Class... groups) {
validate(() -> validator.validateProperty(data, property, groups));
}
protected void tryValidate(Class type, String property, Object value, Class... groups) {
validate(() -> validator.validateValue(type, property, value, groups));
}
protected void tryValidate(Object data, Class... groups) {
validate(() -> validator.validate(data, groups));
}
private <T> void validate(Supplier<Set<ConstraintViolation<T>>> validatorSetFunction) {
if (validator == null) {
logger.warn("validator is null!");
return;
}
SimpleValidateResults results = new SimpleValidateResults();
validator.validate(data).forEach(violation -> results.addResult(violation.getPropertyPath().toString(), violation.getMessage()));
validatorSetFunction.get()
.forEach(violation -> results.addResult(violation.getPropertyPath().toString(), violation.getMessage()));
if (!results.isSuccess())
throw new ValidationException(results);
}

6
hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/GenericEntityService.java
View File

@@ -23,6 +23,8 @@ import org.hswebframework.web.commons.entity.RecordCreationEntity;
import org.hswebframework.web.dao.CrudDao;
import org.hswebframework.web.id.IDGenerator;
import org.hswebframework.utils.ClassUtils;
import org.hswebframework.web.validator.group.CreateGroup;
import org.hswebframework.web.validator.group.UpdateGroup;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
@@ -64,7 +66,7 @@ public abstract class GenericEntityService<E extends GenericEntity<PK>, PK>
@Override
public int updateByPk(PK pk, E entity) {
entity.setId(pk);
tryValidate(entity);
tryValidate(entity, UpdateGroup.class);
return createUpdate(entity)
//如果是RecordCreationEntity则不修改creator_id和creator_time
.when(ClassUtils.instanceOf(getEntityType(), RecordCreationEntity.class),
@@ -104,7 +106,7 @@ public abstract class GenericEntityService<E extends GenericEntity<PK>, PK>
tryValidateProperty(selectByPk(entity.getId()) == null, "id", entity.getId() + "已存在");
}
if (entity.getId() == null) entity.setId(getIDGenerator().generate());
tryValidate(entity);
tryValidate(entity, CreateGroup.class);
getDao().insert(entity);
return entity.getId();
}