1
0

test deep patch into properties and fix typing while patching array properties (#99)

Co-authored-by: Michael Hoennig <michael@hoennig.de>
Reviewed-on: https://dev.hostsharing.net/hostsharing/hs.hsadmin.ng/pulls/99
Reviewed-by: Marc Sandlus <marc.sandlus@hostsharing.net>
This commit is contained in:
Michael Hoennig
2024-09-11 18:16:50 +02:00
parent 13f258fb90
commit b1ab1afbb6
6 changed files with 534 additions and 13 deletions

View File

@@ -12,15 +12,14 @@ import net.hostsharing.hsadminng.hs.hosting.generated.api.v1.model.HsHostingAsse
import net.hostsharing.hsadminng.hs.hosting.generated.api.v1.model.HsHostingAssetTypeResource;
import net.hostsharing.hsadminng.mapper.KeyValueMap;
import net.hostsharing.hsadminng.mapper.Mapper;
import net.hostsharing.hsadminng.persistence.EntityManagerWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.mvc.method.annotation.MvcUriComponentsBuilder;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityNotFoundException;
import jakarta.persistence.PersistenceContext;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -29,8 +28,8 @@ import java.util.function.BiConsumer;
@RestController
public class HsHostingAssetController implements HsHostingAssetsApi {
@PersistenceContext
private EntityManager em;
@Autowired
private EntityManagerWrapper emw;
@Autowired
private Context context;
@@ -75,7 +74,7 @@ public class HsHostingAssetController implements HsHostingAssetsApi {
final var entity = mapper.map(body, HsHostingAssetRbacEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);
final var mapped = new HostingAssetEntitySaveProcessor(em, entity)
final var mapped = new HostingAssetEntitySaveProcessor(emw, entity)
.preprocessEntity()
.validateEntity()
.prepareForSave()
@@ -134,9 +133,9 @@ public class HsHostingAssetController implements HsHostingAssetsApi {
final var entity = rbacAssetRepo.findByUuid(assetUuid).orElseThrow();
new HsHostingAssetEntityPatcher(em, entity).apply(body);
new HsHostingAssetEntityPatcher(emw, entity).apply(body);
final var mapped = new HostingAssetEntitySaveProcessor(em, entity)
final var mapped = new HostingAssetEntitySaveProcessor(emw, entity)
.preprocessEntity()
.validateEntity()
.prepareForSave()
@@ -165,5 +164,5 @@ public class HsHostingAssetController implements HsHostingAssetsApi {
@SuppressWarnings("unchecked")
final BiConsumer<HsHostingAssetRbacEntity, HsHostingAssetResource> ENTITY_TO_RESOURCE_POSTMAPPER = (entity, resource)
-> resource.setConfig(HostingAssetEntityValidatorRegistry.forType(entity.getType())
.revampProperties(em, entity, (Map<String, Object>) resource.getConfig()));
.revampProperties(emw, entity, (Map<String, Object>) resource.getConfig()));
}

View File

@@ -26,6 +26,10 @@ public class ArrayProperty<P extends ValidatableProperty<?, E>, E> extends Valid
}
public static <T> ArrayProperty<?, T[]> arrayOf(final ValidatableProperty<?, T> elementsOf) {
if (elementsOf.type != String.class) {
// see also net.hostsharing.hsadminng.mapper.PatchableMapWrapper.fixValueType
throw new IllegalArgumentException("currently arrayOf(...) is only implemented for stringProperty(...)");
}
//noinspection unchecked
return (ArrayProperty<?, T[]>) new ArrayProperty<>(elementsOf);
}

View File

@@ -6,6 +6,7 @@ import lombok.SneakyThrows;
import org.apache.commons.lang3.tuple.ImmutablePair;
import jakarta.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
@@ -107,7 +108,7 @@ public class PatchableMapWrapper<T> implements Map<String, T> {
if (!Objects.equals(value, delegate.get(key))) {
patched.add(key);
}
return delegate.put(key, value);
return delegate.put(key, fixValueType(value));
}
@Override
@@ -146,4 +147,15 @@ public class PatchableMapWrapper<T> implements Map<String, T> {
public Set<Entry<String, T>> entrySet() {
return delegate.entrySet();
}
private T fixValueType(final T value) {
if (value instanceof ArrayList<?> arrayListValue) {
// Jackson deserialization creates ArrayList for JSON arrays, but we need a String[].
// Jackson could be configured to create Object[], but that does not help.
final var valueToPut = arrayListValue.stream().map(Object::toString).toArray(String[]::new);
//noinspection unchecked
return (T) valueToPut;
}
return value;
}
}

View File

@@ -0,0 +1,300 @@
package net.hostsharing.hsadminng.persistence;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import org.springframework.stereotype.Component;
import jakarta.persistence.EntityGraph;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.EntityTransaction;
import jakarta.persistence.FlushModeType;
import jakarta.persistence.LockModeType;
import jakarta.persistence.PersistenceContext;
import jakarta.persistence.Query;
import jakarta.persistence.StoredProcedureQuery;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaDelete;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.CriteriaUpdate;
import jakarta.persistence.metamodel.Metamodel;
import java.util.List;
import java.util.Map;
/** A Spring bean wrapper for the EntityManager.
*
* <p>@PersistenceContext cannot be properly mocked in @WebMvcTest-based tests
* because Spring will always create a proxy for the mock which then fails because it has no active transaction.</p>
*
* <p>Also, @PersistenceContext cannot be used for constructor injection, though a bean factory would solve that problem.</p>
*
* <p>Use this wrapper **only** if needed for a @WebMvcTest with a mocked EntityManager, otherwise use the original EntityManager.</p>
*/
@Component
@NoArgsConstructor
@AllArgsConstructor
public class EntityManagerWrapper implements EntityManager {
@PersistenceContext
EntityManager em;
@Override
public void persist(final Object entity) {
em.persist(entity);
}
@Override
public <T> T merge(final T entity) {
return em.merge(entity);
}
@Override
public void remove(final Object entity) {
em.remove(entity);
}
@Override
public <T> T find(final Class<T> entityClass, final Object primaryKey) {
return em.find(entityClass, primaryKey);
}
@Override
public <T> T find(final Class<T> entityClass, final Object primaryKey, final Map<String, Object> properties) {
return em.find(entityClass, primaryKey, properties);
}
@Override
public <T> T find(final Class<T> entityClass, final Object primaryKey, final LockModeType lockMode) {
return em.find(entityClass, primaryKey, lockMode);
}
@Override
public <T> T find(
final Class<T> entityClass,
final Object primaryKey,
final LockModeType lockMode,
final Map<String, Object> properties) {
return em.find(entityClass, primaryKey, lockMode, properties);
}
@Override
public <T> T getReference(final Class<T> entityClass, final Object primaryKey) {
return em.getReference(entityClass, primaryKey);
}
@Override
public void flush() {
em.flush();
}
@Override
public void setFlushMode(final FlushModeType flushMode) {
em.setFlushMode(flushMode);
}
@Override
public FlushModeType getFlushMode() {
return em.getFlushMode();
}
@Override
public void lock(final Object entity, final LockModeType lockMode) {
em.lock(entity, lockMode);
}
@Override
public void lock(final Object entity, final LockModeType lockMode, final Map<String, Object> properties) {
em.lock(entity, lockMode, properties);
}
@Override
public void refresh(final Object entity) {
em.refresh(entity);
}
@Override
public void refresh(final Object entity, final Map<String, Object> properties) {
em.refresh(entity, properties);
}
@Override
public void refresh(final Object entity, final LockModeType lockMode) {
em.refresh(entity, lockMode);
}
@Override
public void refresh(final Object entity, final LockModeType lockMode, final Map<String, Object> properties) {
em.refresh(entity, lockMode, properties);
}
@Override
public void clear() {
em.clear();
}
@Override
public void detach(final Object entity) {
em.detach(entity);
}
@Override
public boolean contains(final Object entity) {
return em.contains(entity);
}
@Override
public LockModeType getLockMode(final Object entity) {
return em.getLockMode(entity);
}
@Override
public void setProperty(final String propertyName, final Object value) {
em.setProperty(propertyName, value);
}
@Override
public Map<String, Object> getProperties() {
return em.getProperties();
}
@Override
public Query createQuery(final String qlString) {
return em.createQuery(qlString);
}
@Override
public <T> TypedQuery<T> createQuery(final CriteriaQuery<T> criteriaQuery) {
return em.createQuery(criteriaQuery);
}
@Override
public Query createQuery(final CriteriaUpdate updateQuery) {
return em.createQuery(updateQuery);
}
@Override
public Query createQuery(final CriteriaDelete deleteQuery) {
return em.createQuery(deleteQuery);
}
@Override
public <T> TypedQuery<T> createQuery(final String qlString, final Class<T> resultClass) {
return em.createQuery(qlString, resultClass);
}
@Override
public Query createNamedQuery(final String name) {
return em.createNamedQuery(name);
}
@Override
public <T> TypedQuery<T> createNamedQuery(final String name, final Class<T> resultClass) {
return em.createNamedQuery(name, resultClass);
}
@Override
public Query createNativeQuery(final String sqlString) {
return em.createNativeQuery(sqlString);
}
@Override
public Query createNativeQuery(final String sqlString, final Class resultClass) {
return em.createNativeQuery(sqlString, resultClass);
}
@Override
public Query createNativeQuery(final String sqlString, final String resultSetMapping) {
return em.createNativeQuery(sqlString, resultSetMapping);
}
@Override
public StoredProcedureQuery createNamedStoredProcedureQuery(final String name) {
return em.createNamedStoredProcedureQuery(name);
}
@Override
public StoredProcedureQuery createStoredProcedureQuery(final String procedureName) {
return em.createStoredProcedureQuery(procedureName);
}
@Override
public StoredProcedureQuery createStoredProcedureQuery(final String procedureName, final Class... resultClasses) {
return em.createStoredProcedureQuery(procedureName, resultClasses);
}
@Override
public StoredProcedureQuery createStoredProcedureQuery(final String procedureName, final String... resultSetMappings) {
return em.createStoredProcedureQuery(procedureName, resultSetMappings);
}
@Override
public void joinTransaction() {
em.joinTransaction();
}
@Override
public boolean isJoinedToTransaction() {
return em.isJoinedToTransaction();
}
@Override
public <T> T unwrap(final Class<T> cls) {
return em.unwrap(cls);
}
@Override
public Object getDelegate() {
return em.getDelegate();
}
@Override
public void close() {
em.close();
}
@Override
public boolean isOpen() {
return em.isOpen();
}
@Override
public EntityTransaction getTransaction() {
return em.getTransaction();
}
@Override
public EntityManagerFactory getEntityManagerFactory() {
return em.getEntityManagerFactory();
}
@Override
public CriteriaBuilder getCriteriaBuilder() {
return em.getCriteriaBuilder();
}
@Override
public Metamodel getMetamodel() {
return em.getMetamodel();
}
@Override
public <T> EntityGraph<T> createEntityGraph(final Class<T> rootType) {
return em.createEntityGraph(rootType);
}
@Override
public EntityGraph<?> createEntityGraph(final String graphName) {
return em.createEntityGraph(graphName);
}
@Override
public EntityGraph<?> getEntityGraph(final String graphName) {
return em.getEntityGraph(graphName);
}
@Override
public <T> List<EntityGraph<? super T>> getEntityGraphs(final Class<T> entityClass) {
return em.getEntityGraphs(entityClass);
}
}