test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 03:38:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-8448 Error occurs during an attempt to import an entity in additional data store using Entity Inspector

Browse Source
This commit is contained in:
Andrey Subbotin 2017-01-13 13:11:56 +04:00
parent 372b5688b0
commit da2988e03a
1 changed files with 57 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
modules/core/src/com/haulmont/cuba/core/app/importexport/EntityImportExport.java
View File

@ -19,7 +19,6 @@ package com.haulmont.cuba.core.app.importexport;
import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import com.haulmont.chile.core.model.MetaClass; import com.haulmont.chile.core.model.MetaClass;
import com.haulmont.chile.core.model.MetaProperty; import com.haulmont.chile.core.model.MetaProperty;
import com.haulmont.cuba.core.*; import com.haulmont.cuba.core.*;
@ -33,7 +32,6 @@ import com.haulmont.cuba.core.entity.SoftDelete;
import com.haulmont.cuba.core.global.Metadata; import com.haulmont.cuba.core.global.Metadata;
import com.haulmont.cuba.core.global.PersistenceHelper; import com.haulmont.cuba.core.global.PersistenceHelper;
import com.haulmont.cuba.core.global.View; import com.haulmont.cuba.core.global.View;
import com.haulmont.cuba.core.sys.SecurityTokenManager;
import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
@ -155,27 +153,35 @@ public class EntityImportExport implements EntityImportExportAPI {
@Override @Override
public Collection<Entity> importEntities(Collection<? extends Entity> entities, EntityImportView view) { public Collection<Entity> importEntities(Collection<? extends Entity> entities, EntityImportView view) {
Collection<Entity> result = new ArrayList<>(); Collection<Entity> result = new ArrayList<>();
Map<String, List<Entity>> entitiesByStore = new LinkedHashMap<>();
for (Entity entity : entities) {
String storeName = metadata.getTools().getStoreName(entity.getMetaClass());
List<Entity> list = entitiesByStore.computeIfAbsent(storeName, k -> new ArrayList<>());
list.add(entity);
}
for (String storeName : entitiesByStore.keySet()) {
Map<Object, Entity> entitiesToCreate = new HashMap<>(); Map<Object, Entity> entitiesToCreate = new HashMap<>();
Set<Entity> entitiesToRemove = new HashSet<>(); Set<Entity> entitiesToRemove = new HashSet<>();
List<ReferenceInfo> referenceInfoList = new ArrayList<>(); List<ReferenceInfo> referenceInfoList = new ArrayList<>();
Map<Object, Entity> loadedEntities = new HashMap<>(); Map<Object, Entity> loadedEntities = new HashMap<>();
try (Transaction tx = persistence.getTransaction()) { try (Transaction tx = persistence.getTransaction(storeName)) {
//import is performed in two steps. We have to do so, because imported entity may have a reference to //import is performed in two steps. We have to do so, because imported entity may have a reference to
//some next imported entity. //some next imported entity.
//1. entities that should be created processed first, fields that should be references to existing entities //1. entities that should be created processed first, fields that should be references to existing entities
//are stored in the referenceInfoList variable //are stored in the referenceInfoList variable
for (Entity entity : entities) { for (Entity entity : entities) {
importEntity(entity, view, entitiesToCreate, entitiesToRemove, referenceInfoList); importEntity(entity, view, storeName, entitiesToCreate, entitiesToRemove, referenceInfoList);
} }
//2. references to existing entities are processed //2. references to existing entities are processed
for (ReferenceInfo referenceInfo : referenceInfoList) { for (ReferenceInfo referenceInfo : referenceInfoList) {
processReferenceInfo(referenceInfo, entitiesToCreate, loadedEntities); processReferenceInfo(referenceInfo, storeName, entitiesToCreate, loadedEntities);
} }
EntityManager em = persistence.getEntityManager(); EntityManager em = persistence.getEntityManager(storeName);
for (Entity entity : entitiesToCreate.values()) { for (Entity entity : entitiesToCreate.values()) {
if (PersistenceHelper.isNew(entity)) { if (PersistenceHelper.isNew(entity)) {
em.persist(entity); em.persist(entity);
@ -197,15 +203,17 @@ public class EntityImportExport implements EntityImportExportAPI {
tx.commit(); tx.commit();
} }
}
return result; return result;
} }
protected Entity importEntity(Entity srcEntity, protected Entity importEntity(Entity srcEntity,
EntityImportView view, EntityImportView view,
String storeName,
Map<Object, Entity> entitiesToCreate, Map<Object, Entity> entitiesToCreate,
Set<Entity> entitiesToRemove, Set<Entity> entitiesToRemove,
Collection<ReferenceInfo> referenceInfoList) { Collection<ReferenceInfo> referenceInfoList) {
EntityManager em = persistence.getEntityManager(); EntityManager em = persistence.getEntityManager(storeName);
//set softDeletion to false because we can import deleted entity, so we'll restore it and update //set softDeletion to false because we can import deleted entity, so we'll restore it and update
em.setSoftDeletion(false); em.setSoftDeletion(false);
Entity dstEntity = em.reload(srcEntity); Entity dstEntity = em.reload(srcEntity);
@ -228,13 +236,13 @@ public class EntityImportExport implements EntityImportExportAPI {
} else if (metaProperty.getRange().isClass()) { } else if (metaProperty.getRange().isClass()) {
if (metadata.getTools().isEmbedded(metaProperty)) { if (metadata.getTools().isEmbedded(metaProperty)) {
if (viewProperty.getView() != null) { if (viewProperty.getView() != null) {
Entity embeddedEntity = importEmbeddedAttribute(srcEntity, dstEntity, viewProperty, entitiesToCreate, entitiesToRemove, referenceInfoList); Entity embeddedEntity = importEmbeddedAttribute(srcEntity, dstEntity, viewProperty, storeName, entitiesToCreate, entitiesToRemove, referenceInfoList);
dstEntity.setValue(viewProperty.getName(), embeddedEntity); dstEntity.setValue(viewProperty.getName(), embeddedEntity);
} }
} else if (metaProperty.getRange().getCardinality().isMany()) { } else if (metaProperty.getRange().getCardinality().isMany()) {
importCollectionAttribute(srcEntity, dstEntity, viewProperty, entitiesToCreate, entitiesToRemove, referenceInfoList); importCollectionAttribute(srcEntity, dstEntity, viewProperty, storeName, entitiesToCreate, entitiesToRemove, referenceInfoList);
} else { } else {
importReference(srcEntity, dstEntity, viewProperty, entitiesToCreate, entitiesToRemove, referenceInfoList); importReference(srcEntity, dstEntity, viewProperty, storeName, entitiesToCreate, entitiesToRemove, referenceInfoList);
} }
} }
} }
@ -253,6 +261,7 @@ public class EntityImportExport implements EntityImportExportAPI {
protected Entity importEmbeddedAttribute(Entity srcEntity, protected Entity importEmbeddedAttribute(Entity srcEntity,
Entity dstEntity, Entity dstEntity,
EntityImportViewProperty viewProperty, EntityImportViewProperty viewProperty,
String storeName,
Map<Object, Entity> entitiesToCreate, Map<Object, Entity> entitiesToCreate,
Set<Entity> entitiesToRemove, Set<Entity> entitiesToRemove,
Collection<ReferenceInfo> referenceInfoList) { Collection<ReferenceInfo> referenceInfoList) {
@ -273,9 +282,9 @@ public class EntityImportExport implements EntityImportExportAPI {
dstEmbeddedEntity.setValue(vp.getName(), srcEmbeddedEntity.getValue(vp.getName())); dstEmbeddedEntity.setValue(vp.getName(), srcEmbeddedEntity.getValue(vp.getName()));
} else if (mp.getRange().isClass()) { } else if (mp.getRange().isClass()) {
if (mp.getRange().getCardinality().isMany()) { if (mp.getRange().getCardinality().isMany()) {
importCollectionAttribute(srcEmbeddedEntity, dstEmbeddedEntity, vp, entitiesToCreate, entitiesToRemove, referenceInfoList); importCollectionAttribute(srcEmbeddedEntity, dstEmbeddedEntity, vp, storeName, entitiesToCreate, entitiesToRemove, referenceInfoList);
} else { } else {
importReference(srcEmbeddedEntity, dstEmbeddedEntity, vp, entitiesToCreate, entitiesToRemove, referenceInfoList); importReference(srcEmbeddedEntity, dstEmbeddedEntity, vp, storeName, entitiesToCreate, entitiesToRemove, referenceInfoList);
} }
} }
} }
@ -287,6 +296,7 @@ public class EntityImportExport implements EntityImportExportAPI {
protected void importReference(Entity srcEntity, protected void importReference(Entity srcEntity,
Entity dstEntity, Entity dstEntity,
EntityImportViewProperty viewProperty, EntityImportViewProperty viewProperty,
String storeName,
Map<Object, Entity> entitiesToCreate, Map<Object, Entity> entitiesToCreate,
Set<Entity> entitiesToRemove, Collection<ReferenceInfo> referenceInfoList) { Set<Entity> entitiesToRemove, Collection<ReferenceInfo> referenceInfoList) {
Entity srcPropertyValue = srcEntity.<Entity>getValue(viewProperty.getName()); Entity srcPropertyValue = srcEntity.<Entity>getValue(viewProperty.getName());
@ -294,7 +304,7 @@ public class EntityImportExport implements EntityImportExportAPI {
ReferenceInfo referenceInfo = new ReferenceInfo(dstEntity, viewProperty.getName(), srcPropertyValue, viewProperty.getReferenceImportBehaviour()); ReferenceInfo referenceInfo = new ReferenceInfo(dstEntity, viewProperty.getName(), srcPropertyValue, viewProperty.getReferenceImportBehaviour());
referenceInfoList.add(referenceInfo); referenceInfoList.add(referenceInfo);
} else { } else {
Entity dstPropertyValue = importEntity(srcPropertyValue, viewProperty.getView(), entitiesToCreate, entitiesToRemove, referenceInfoList); Entity dstPropertyValue = importEntity(srcPropertyValue, viewProperty.getView(), storeName, entitiesToCreate, entitiesToRemove, referenceInfoList);
dstEntity.setValue(viewProperty.getName(), dstPropertyValue); dstEntity.setValue(viewProperty.getName(), dstPropertyValue);
} }
} }
@ -302,6 +312,7 @@ public class EntityImportExport implements EntityImportExportAPI {
protected void importCollectionAttribute(Entity srcEntity, protected void importCollectionAttribute(Entity srcEntity,
Entity dstEntity, Entity dstEntity,
EntityImportViewProperty viewProperty, EntityImportViewProperty viewProperty,
String storeName,
Map<Object, Entity> entitiesToCreate, Map<Object, Entity> entitiesToCreate,
Set<Entity> entitiesToRemove, Set<Entity> entitiesToRemove,
Collection<ReferenceInfo> referenceInfoList) { Collection<ReferenceInfo> referenceInfoList) {
@ -349,7 +360,7 @@ public class EntityImportExport implements EntityImportExportAPI {
referenceInfoList.add(referenceInfo); referenceInfoList.add(referenceInfo);
} else { } else {
//create new referenced entity //create new referenced entity
Entity dstChildEntity = importEntity(srcChildEntity, viewProperty.getView(), entitiesToCreate, entitiesToRemove, referenceInfoList); Entity dstChildEntity = importEntity(srcChildEntity, viewProperty.getView(), storeName, entitiesToCreate, entitiesToRemove, referenceInfoList);
if (inverseMetaProperty != null) { if (inverseMetaProperty != null) {
dstChildEntity.setValue(inverseMetaProperty.getName(), dstEntity); dstChildEntity.setValue(inverseMetaProperty.getName(), dstEntity);
} }
@ -372,7 +383,7 @@ public class EntityImportExport implements EntityImportExportAPI {
dstEntity.setValue(viewProperty.getName(), collection); dstEntity.setValue(viewProperty.getName(), collection);
} }
protected void processReferenceInfo(ReferenceInfo referenceInfo, Map<Object, Entity> entitiesToCreate, Map<Object, Entity> loadedEntities) { protected void processReferenceInfo(ReferenceInfo referenceInfo, String store, Map<Object, Entity> entitiesToCreate, Map<Object, Entity> loadedEntities) {
Entity entity = referenceInfo.getEntity(); Entity entity = referenceInfo.getEntity();
String propertyName = referenceInfo.getPropertyName(); String propertyName = referenceInfo.getPropertyName();
@ -399,7 +410,7 @@ public class EntityImportExport implements EntityImportExportAPI {
} else if (entitiesToCreate.get(childEntity.getId()) != null) { } else if (entitiesToCreate.get(childEntity.getId()) != null) {
collection.add(entitiesToCreate.get(childEntity.getId())); collection.add(entitiesToCreate.get(childEntity.getId()));
} else { } else {
EntityManager em = persistence.getEntityManager(); EntityManager em = persistence.getEntityManager(store);
Entity loadedReference = em.reload(childEntity); Entity loadedReference = em.reload(childEntity);
if (loadedReference == null) { if (loadedReference == null) {
if (referenceInfo.getImportBehaviour() == ReferenceImportBehaviour.ERROR_ON_MISSING) { if (referenceInfo.getImportBehaviour() == ReferenceImportBehaviour.ERROR_ON_MISSING) {
@ -424,7 +435,7 @@ public class EntityImportExport implements EntityImportExportAPI {
} else if (entitiesToCreate.get(propertyValue.getId()) != null) { } else if (entitiesToCreate.get(propertyValue.getId()) != null) {
entity.setValue(propertyName, entitiesToCreate.get(propertyValue.getId())); entity.setValue(propertyName, entitiesToCreate.get(propertyValue.getId()));
} else { } else {
EntityManager em = persistence.getEntityManager(); EntityManager em = persistence.getEntityManager(store);
Entity loadedReference = em.find(propertyValue.getClass(), propertyValue.getId()); Entity loadedReference = em.find(propertyValue.getClass(), propertyValue.getId());
if (loadedReference == null) { if (loadedReference == null) {
if (referenceInfo.getImportBehaviour() == ReferenceImportBehaviour.ERROR_ON_MISSING) { if (referenceInfo.getImportBehaviour() == ReferenceImportBehaviour.ERROR_ON_MISSING) {