BGBM BDI Projects
/
cdmlib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cbd7bb8
)
some updates to advanced bean initialization
author
Andreas Müller
<a.mueller@bgbm.org>
Tue, 5 Nov 2013 22:56:05 +0000
(22:56 +0000)
committer
Andreas Müller
<a.mueller@bgbm.org>
Tue, 5 Nov 2013 22:56:05 +0000
(22:56 +0000)
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/AdvancedBeanInitializer.java
patch
|
blob
|
history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/AnnotationTypeAutoInitializer.java
patch
|
blob
|
history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/MarkerTypeAutoInitializer.java
patch
|
blob
|
history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/MediaAutoInitializer.java
patch
|
blob
|
history
diff --git
a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/AdvancedBeanInitializer.java
b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/AdvancedBeanInitializer.java
index 33a0972fd23e1278f24c4e0e71cdb081ffa73b7d..500ebd9aa12a58cbf5a623893099a39d85ea9eb4 100644
(file)
--- a/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/AdvancedBeanInitializer.java
+++ b/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/AdvancedBeanInitializer.java
@@
-412,6
+412,7
@@
public class AdvancedBeanInitializer extends HibernateBeanInitializer {
if (newBean instanceof HibernateProxy){
\r
newBean = initializeInstance(newBean);
\r
}
\r
if (newBean instanceof HibernateProxy){
\r
newBean = initializeInstance(newBean);
\r
}
\r
+ autoinitializeBean(newBean);
\r
node.addBean(newBean);
\r
}
\r
if (logger.isDebugEnabled()){logger.debug("bulk load " + node + " collections - DONE");}
\r
node.addBean(newBean);
\r
}
\r
if (logger.isDebugEnabled()){logger.debug("bulk load " + node + " collections - DONE");}
\r
diff --git
a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/AnnotationTypeAutoInitializer.java
b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/AnnotationTypeAutoInitializer.java
index a1fc4d680520dda922c599c31f5e34b7b7c3a02c..4e95fea8aef7f46c71db896d88a95ed894b00f9b 100644
(file)
--- a/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/AnnotationTypeAutoInitializer.java
+++ b/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/AnnotationTypeAutoInitializer.java
@@
-26,5
+26,10
@@
public class AnnotationTypeAutoInitializer extends AutoPropertyInitializer<Annot
public void initialize(Annotation bean) {
\r
beanInitializer.initializeInstance(bean.getAnnotationType());
\r
}
\r
public void initialize(Annotation bean) {
\r
beanInitializer.initializeInstance(bean.getAnnotationType());
\r
}
\r
+
\r
+ @Override
\r
+ public String hibernateFetchJoin(Class<?> clazz, String beanAlias){
\r
+ return String.format(" LEFT JOIN FETCH %s.annotationType ", beanAlias);
\r
+ }
\r
\r
}
\r
\r
}
\r
diff --git
a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/MarkerTypeAutoInitializer.java
b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/MarkerTypeAutoInitializer.java
index 3f1afc3ca6b031e767fe9eac40d560823e924b5b..173e1a4d95cb50115f84cb5cb377aaa30f4ab524 100644
(file)
--- a/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/MarkerTypeAutoInitializer.java
+++ b/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/MarkerTypeAutoInitializer.java
@@
-26,5
+26,10
@@
public class MarkerTypeAutoInitializer extends AutoPropertyInitializer<Marker> {
public void initialize(Marker bean) {
\r
beanInitializer.initializeInstance(bean.getMarkerType());
\r
}
\r
public void initialize(Marker bean) {
\r
beanInitializer.initializeInstance(bean.getMarkerType());
\r
}
\r
+
\r
+ @Override
\r
+ public String hibernateFetchJoin(Class<?> clazz, String beanAlias){
\r
+ return String.format(" LEFT JOIN FETCH %s.markerType ", beanAlias);
\r
+ }
\r
\r
}
\r
\r
}
\r
diff --git
a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/MediaAutoInitializer.java
b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/MediaAutoInitializer.java
index 68d0deaa434721ed2f0340c5b5e6ac86ad417d28..e0f0853230ddf01c8d966d79c7c0d0a459ec09c0 100644
(file)
--- a/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/MediaAutoInitializer.java
+++ b/
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/MediaAutoInitializer.java
@@
-26,4
+26,10
@@
public class MediaAutoInitializer extends AutoPropertyInitializer<Media> {
beanInitializer.initializeInstance(r.getParts());
\r
}
\r
}
\r
beanInitializer.initializeInstance(r.getParts());
\r
}
\r
}
\r
+
\r
+
\r
+ @Override
\r
+ public String hibernateFetchJoin(Class<?> clazz, String beanAlias){
\r
+ return String.format(" LEFT JOIN FETCH %s.representations r LEFT JOIN FETCH r.mediaRepresentationParts ", beanAlias);
\r
+ }
\r
}
\r
}
\r