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

Refs #1382 View repository - sometimes first getView() throws ViewNotFoundException

Browse Source
This commit is contained in:
Konstantin Krivopustov 2012-08-09 06:24:23 +00:00
parent 9c584198bb
commit 5d5888340e
3 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/client/src/com/haulmont/cuba/client/sys/MetadataClientImpl.java
View File

@ -10,6 +10,7 @@ import com.haulmont.bali.util.ReflectionHelper;
import com.haulmont.chile.core.loader.ChileMetadataLoader;
import com.haulmont.chile.core.loader.MetadataLoader;
import com.haulmont.chile.core.model.MetaClass;
import com.haulmont.chile.core.model.Session;
import com.haulmont.cuba.client.ClientConfig;
import com.haulmont.cuba.core.app.ServerInfoService;
import com.haulmont.cuba.core.global.*;
@ -57,7 +58,7 @@ public class MetadataClientImpl extends AbstractMetadata {
loadMetadata(metadataLoader, packages);
metadataLoader.postProcess();
session = metadataLoader.getSession();
Session session = metadataLoader.getSession();
metadataLoader = new ChileMetadataLoader(session);
packages = metadataBuildInfo.getTransientEntitiesPackages();
@ -71,12 +72,15 @@ public class MetadataClientImpl extends AbstractMetadata {
}
}
replacedEntities = new HashMap<Class, Class>();
Map<Class, Class> replacedEntities = new HashMap<Class, Class>();
for (Map.Entry<String, String> entry : metadataBuildInfo.getReplacedEntities().entrySet()) {
Class from = ReflectionHelper.getClass(entry.getKey());
Class to = ReflectionHelper.getClass(entry.getValue());
replacedEntities.put(from, to);
}
this.session = session;
this.replacedEntities = replacedEntities;
}
@Override
@ -85,7 +89,7 @@ public class MetadataClientImpl extends AbstractMetadata {
boolean lazyLoadServerViews = configuration.getConfig(ClientConfig.class).getLazyLoadServerViews();
viewRepository = new ViewRepositoryClient(lazyLoadServerViews, serverInfoService);
ViewRepositoryClient viewRepository = new ViewRepositoryClient(lazyLoadServerViews, serverInfoService);
if (!lazyLoadServerViews) {
List<View> views = serverInfoService.getViews();
@ -102,5 +106,7 @@ public class MetadataClientImpl extends AbstractMetadata {
viewRepository.deployViews(fileName);
}
}
this.viewRepository = viewRepository;
}
}

9
modules/client/test/com/haulmont/cuba/client/testsupport/TestMetadataClient.java
View File

@ -8,6 +8,7 @@ package com.haulmont.cuba.client.testsupport;
import com.haulmont.chile.core.loader.ChileMetadataLoader;
import com.haulmont.chile.core.loader.MetadataLoader;
import com.haulmont.chile.core.model.Session;
import com.haulmont.cuba.core.global.ViewRepository;
import com.haulmont.cuba.core.sys.AbstractMetadata;
import com.haulmont.cuba.core.sys.PersistentClassesMetadataLoader;
@ -40,7 +41,7 @@ public class TestMetadataClient extends AbstractMetadata {
}
metadataLoader.postProcess();
session = metadataLoader.getSession();
Session session = metadataLoader.getSession();
metadataLoader = new ChileMetadataLoader(session);
for (String p : packages) {
@ -48,13 +49,15 @@ public class TestMetadataClient extends AbstractMetadata {
}
metadataLoader.postProcess();
replacedEntities = new HashMap<Class, Class>();
this.session = session;
this.replacedEntities = new HashMap<Class, Class>();
}
@Override
protected void initViews() {
viewRepository = new ViewRepository();
ViewRepository viewRepository = new ViewRepository();
if (!StringUtils.isEmpty(viewsConfig))
viewRepository.deployViews(viewsConfig);
this.viewRepository = viewRepository;
}
}

24
modules/core/src/com/haulmont/cuba/core/sys/MetadataImpl.java
View File

@ -11,6 +11,7 @@ import com.haulmont.bali.util.ReflectionHelper;
import com.haulmont.chile.core.loader.ChileMetadataLoader;
import com.haulmont.chile.core.loader.MetadataLoader;
import com.haulmont.chile.core.model.MetaClass;
import com.haulmont.chile.core.model.Session;
import com.haulmont.cuba.core.entity.annotation.EnableRestore;
import com.haulmont.cuba.core.entity.annotation.SystemLevel;
import com.haulmont.cuba.core.entity.annotation.TrackEditScreenHistory;
@ -23,9 +24,9 @@ import org.apache.commons.logging.LogFactory;
import org.dom4j.Element;
import javax.annotation.ManagedBean;
import java.lang.annotation.Annotation;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
/**
* <p>$Id$</p>
@ -48,7 +49,7 @@ public class MetadataImpl extends AbstractMetadata {
loadMetadata(metadataLoader, packages);
metadataLoader.postProcess();
session = metadataLoader.getSession();
Session session = metadataLoader.getSession();
metadataLoader = new ChileMetadataLoader(session);
packages = MetadataBuildHelper.getTransientEntitiesPackages();
@ -59,9 +60,12 @@ public class MetadataImpl extends AbstractMetadata {
initMetaAnnotations(metaClass);
}
replacedEntities = new HashMap<Class, Class>();
Map<Class, Class> replacedEntities = new HashMap<Class, Class>();
processMetadataXml();
processMetadataXml(session, replacedEntities);
this.session = session;
this.replacedEntities = replacedEntities;
}
/**
@ -86,21 +90,21 @@ public class MetadataImpl extends AbstractMetadata {
metaClass.getAnnotations().put(TrackEditScreenHistory.class.getName(), trackEditScreenHistory.value());
}
protected void processMetadataXml() {
protected void processMetadataXml(Session session, Map<Class, Class> replacedEntities) {
String config = MetadataBuildHelper.getMetadataConfig();
StrTokenizer tokenizer = new StrTokenizer(config);
for (String fileName : tokenizer.getTokenArray()) {
processMetadataXmlFile(fileName);
processMetadataXmlFile(session, replacedEntities, fileName);
}
}
protected void processMetadataXmlFile(String path) {
protected void processMetadataXmlFile(Session session, Map<Class, Class> replacedEntities, String path) {
Element root = MetadataBuildHelper.readXml(path);
for (Element element : Dom4j.elements(root, "include")) {
String fileName = element.attributeValue("file");
if (!StringUtils.isBlank(fileName)) {
processMetadataXmlFile(fileName);
processMetadataXmlFile(session, replacedEntities, fileName);
}
}
@ -136,7 +140,7 @@ public class MetadataImpl extends AbstractMetadata {
@Override
protected void initViews() {
log.info("Initializing views");
viewRepository = new ViewRepository();
ViewRepository viewRepository = new ViewRepository();
String configName = AppContext.getProperty("cuba.viewsConfig");
if (!StringUtils.isBlank(configName)) {
@ -145,5 +149,7 @@ public class MetadataImpl extends AbstractMetadata {
viewRepository.deployViews(fileName);
}
}
this.viewRepository = viewRepository;
}
}