test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-11-30 18:27:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-6340 PersistenceHelper.isLoaded method can initiate unnecessary collection/attribute fetch

Browse Source 
#PL-6340
This commit is contained in:
Eugeny Degtyarjov 2015-11-25 12:54:45 +00:00
parent 296e3237e4
commit 3196705b58
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/core/test/com/haulmont/cuba/core/PersistenceAttributeLoadedCheckTest.java
View File

@ -10,28 +10,35 @@ import com.haulmont.cuba.core.global.*;
import com.haulmont.cuba.security.entity.Group;
import com.haulmont.cuba.security.entity.User;
import com.haulmont.cuba.security.entity.UserRole;
import com.haulmont.cuba.testsupport.TestContainer;
import com.haulmont.cuba.testsupport.TestSupport;
import org.junit.Assert;
import org.junit.*;
import java.util.UUID;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
* @author degtyarjov
* @version $Id$
*/
public class PersistenceAttributeLoadedCheckTest extends CubaTestCase {
public class PersistenceAttributeLoadedCheckTest {
@ClassRule
public static final TestContainer container = TestContainer.Common.INSTANCE;
private DataManager dataManager;
private Persistence persistence;
private UUID taskId;
private UUID userId;
private UUID groupId = UUID.fromString("0fa2b1a5-1d68-4d69-9fbd-dff348347f93");
private View taskView;
private View userView;
@Override
@Before
public void setUp() throws Exception {
super.setUp();
dataManager = AppBeans.get(DataManager.class);
persistence = AppBeans.get(Persistence.class);
try (Transaction tx = persistence.createTransaction()) {
EntityManager em = persistence.getEntityManager();
@ -66,13 +73,13 @@ public class PersistenceAttributeLoadedCheckTest extends CubaTestCase {
.addProperty("userRoles", new View(UserRole.class));
}
@Override
protected void tearDown() throws Exception {
deleteRecord("SEC_USER", userId);
deleteRecord("SYS_SCHEDULED_TASK", taskId);
super.tearDown();
@After
public void tearDown() throws Exception {
container.deleteRecord("SEC_USER", userId);
container.deleteRecord("SYS_SCHEDULED_TASK", taskId);
}
@Test
public void testIsLoadedLogic() throws Exception {
LoadContext<User> userContext = LoadContext.create(User.class).setId(userId).setView(userView);
LoadContext<ScheduledTask> taskContext = LoadContext.create(ScheduledTask.class).setId(taskId).setView(taskView);

13
modules/global/src/com/haulmont/cuba/core/global/GlobalPersistentAttributesLoadChecker.java
View File

@ -46,13 +46,20 @@ public class GlobalPersistentAttributesLoadChecker implements PersistentAttribut
}
protected Boolean isLoadedCommonCheck(Object entity, String property) {
if (entity instanceof BaseGenericIdEntity
&& ((BaseGenericIdEntity) entity).__inaccessibleAttributes() != null) {
for (String inaccessibleAttr : ((BaseGenericIdEntity) entity).__inaccessibleAttributes()) {
if (entity instanceof BaseGenericIdEntity) {
BaseGenericIdEntity baseGenericIdEntity = (BaseGenericIdEntity) entity;
if (baseGenericIdEntity.__new()) {
return true;
}
if (baseGenericIdEntity.__inaccessibleAttributes() != null) {
for (String inaccessibleAttr : baseGenericIdEntity.__inaccessibleAttributes()) {
if (inaccessibleAttr.equals(property))
return false;
}
}
}
if (entity instanceof FetchGroupTracker) {
FetchGroup fetchGroup = ((FetchGroupTracker) entity)._persistence_getFetchGroup();