hostsharing/hs.hsadmin.ng
1
0
Fork 0
Code Activity

Deserializer: improved test code coverage for entity associations

Browse Source
This commit is contained in:
Michael Hoennig
2019-05-22 21:53:45 +02:00
parent e7cb3622f3
commit cbb5532394
7 changed files with 176 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/hostsharing/hsadminng/domain/UserRoleAssignment.java
View File

@ -197,7 +197,7 @@ public class UserRoleAssignment implements AccessMappings {
protected JSonFieldReader<UserRoleAssignment> jsonFieldReader(final TreeNode treeNode, final Field field) {
if ("user".equals(field.getName())) {
return (final UserRoleAssignment target) -> {
target.setUser(userRepository.getOne(getSubNode(treeNode, "id")));
target.setUser(userRepository.getOne(getSubNode(treeNode, "id").asLong()));
};
}

2
src/main/java/org/hostsharing/hsadminng/service/accessfilter/AccessMappings.java
View File

@ -8,4 +8,6 @@ import java.io.Serializable;
* {@link JsonDeserializerWithAccessFilter}.
*/
public interface AccessMappings extends Serializable {
Long getId();
}

5
src/main/java/org/hostsharing/hsadminng/service/accessfilter/JSonAccessFilter.java
View File

@ -81,10 +81,11 @@ abstract class JSonAccessFilter<T extends AccessMappings> {
final Class<IdToDtoResolver> rawType = IdToDtoResolver.class;
final Class<?> parentDtoClass = ReflectionUtil.<T> determineGenericInterfaceParameter(parentDtoLoader, rawType, 0);
final Long parentId = ReflectionUtil.getValue(dto, parentIdField);
if (parentId == null) {
final Object parent = ReflectionUtil.getValue(dto, parentIdField);
if (parent == null) {
return emptySet();
}
final Long parentId = parent instanceof AccessMappings ? (((AccessMappings) parent).getId()) : (Long) parent;
final Set<Role> rolesOnParent = getLoginUserDirectRolesFor(parentDtoClass, parentId);
final Object parentEntity = loadDto(parentDtoLoader, parentId);

44
src/main/java/org/hostsharing/hsadminng/service/accessfilter/JsonDeserializerWithAccessFilter.java
View File

@ -1,6 +1,7 @@
// Licensed under Apache-2.0
package org.hostsharing.hsadminng.service.accessfilter;
import static com.google.common.base.Verify.verify;
import static org.hostsharing.hsadminng.service.util.ReflectionUtil.unchecked;
import org.hostsharing.hsadminng.service.UserRoleAssignmentService;
@ -58,16 +59,24 @@ public abstract class JsonDeserializerWithAccessFilter<T extends AccessMappings>
};
}
protected final Long getSubNode(final TreeNode node, final String name) {
if (!node.isObject()) {
throw new IllegalArgumentException(node + " is not a JSON object");
}
/**
* Returns the named subnode of the given node.
* <p>
* If entities are used instead of DTOs, JHipster will generate code which sends
* complete entity trees to the REST endpoint. In most cases, we only need the "id",
* though.
* </p>
*
* @param node the JSON node of which a subnode is to be returned
* @param name the name of the subnode within 'node'
* @return the subnode of 'node' with the given 'name'
*/
protected final JsonNode getSubNode(final TreeNode node, final String name) {
verify(node.isObject(), node + " is not a JSON object");
final ObjectNode objectNode = (ObjectNode) node;
final JsonNode subNode = objectNode.get(name);
if (!subNode.isNumber()) {
throw new IllegalArgumentException(node + "." + name + " is not a number");
}
return subNode.asLong();
verify(subNode.isNumber(), node + "." + name + " is not a number");
return subNode;
}
private Object readValueFromJSon(final TreeNode treeNode, final Field field) {
@ -199,13 +208,11 @@ public abstract class JsonDeserializerWithAccessFilter<T extends AccessMappings>
private void checkAccessToWrittenFields(final T currentDto) {
updatingFields.forEach(
field -> {
if (!field.equals(selfIdField)) {
final Set<Role> roles = getLoginUserRoles();
if (isInitAccess()) {
validateInitAccess(field, roles);
} else {
validateUpdateAccess(field, roles);
}
final Set<Role> roles = getLoginUserRoles();
if (isInitAccess()) {
validateInitAccess(field, roles);
} else {
validateUpdateAccess(field, roles);
}
});
}
@ -265,11 +272,14 @@ public abstract class JsonDeserializerWithAccessFilter<T extends AccessMappings>
private <F> boolean isActuallyUpdated(final Field field, final T dto, T currentDto) {
final Object o1 = ReflectionUtil.getValue(dto, field);
final Object o2 = ReflectionUtil.getValue(currentDto, field);
if (o1 != null && o2 != null && o1 instanceof Comparable && o2 instanceof Comparable) {
if (o1 instanceof Comparable && o2 instanceof Comparable) {
verify(
o2 instanceof Comparable,
"either neither or both objects must implement Comparable"); // $COVERAGE-IGNORE$
return 0 != ((Comparable) o1).compareTo(o2);
}
return ObjectUtils.notEqual(o1, o2);
}
}
}