Revision 64367d00
Added by Katja Luther over 8 years ago
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultImport.java | ||
---|---|---|
128 | 128 |
state.initialize(config); |
129 | 129 |
|
130 | 130 |
//do check for each class |
131 |
for (Class<ICdmImport> ioClass: config.getIoClassList()){
|
|
131 |
for (Class<ICdmIO> ioClass: config.getIoClassList()){
|
|
132 | 132 |
try { |
133 | 133 |
String ioBeanName = getComponentBeanName(ioClass); |
134 | 134 |
ICdmIO cdmIo = applicationContext.getBean(ioBeanName, ICdmIO.class); |
... | ... | |
197 | 197 |
|
198 | 198 |
state.setSuccess(true); |
199 | 199 |
//do invoke for each class |
200 |
for (Class<ICdmImport> ioClass: config.getIoClassList()){
|
|
200 |
for (Class<ICdmIO> ioClass: config.getIoClassList()){
|
|
201 | 201 |
try { |
202 | 202 |
String ioBeanName = getComponentBeanName(ioClass); |
203 |
ICdmImport cdmIo = applicationContext.getBean(ioBeanName, ICdmImport.class);
|
|
203 |
ICdmIO cdmIo = applicationContext.getBean(ioBeanName, ICdmIO.class);
|
|
204 | 204 |
if (cdmIo != null){ |
205 | 205 |
registerObservers(config, cdmIo); |
206 | 206 |
state.setCurrentIO(cdmIo); |
207 | 207 |
result &= cdmIo.invoke(state); |
208 |
importResult.addReport(cdmIo.getByteArray()); |
|
208 |
//importResult.addReport(cdmIo.getByteArray());
|
|
209 | 209 |
unRegisterObservers(config, cdmIo); |
210 | 210 |
}else{ |
211 | 211 |
logger.error("cdmIO was null"); |
... | ... | |
250 | 250 |
* @return |
251 | 251 |
* @throws IllegalArgumentException if the class does not have a "Component" annotation |
252 | 252 |
*/ |
253 |
public static String getComponentBeanName(Class<ICdmImport> ioClass) throws IllegalArgumentException {
|
|
253 |
public static String getComponentBeanName(Class<ICdmIO> ioClass) throws IllegalArgumentException {
|
|
254 | 254 |
Component component = ioClass.getAnnotation(Component.class); |
255 | 255 |
if (component == null){ |
256 | 256 |
throw new IllegalArgumentException("Class " + ioClass.getName() + " is missing a @Component annotation." ); |
Also available in: Unified diff
minor