/ - Diff - EDIT - EDIT Project Management

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/ValidationEventListenerBase.java
84	84	try {
85	85	if (!(object instanceof CdmBase)) {
86	86	if (object.getClass() != HashMap.class) {
87		logger.warn(levelString() + " validation bypassed for entities of type " + object.getClass().getName());
	87	if(logger.isDebugEnabled()){ logger.debug(levelString() + " validation bypassed for entities of type " + object.getClass().getName());}
88	88	}
89	89	return;
90	90	}

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/EntityValidationTaskBase.java
101	101	}
102	102	} catch (Throwable t) {
103	103	logger.error("Error while validating " + entity.toString() + ": " + t.getMessage());
	104	t.printStackTrace();
104	105	}
105	106	}
106	107

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/validation/ValidationExecutor.java
82	82	* @author ayco_holleman
83	83	*
84	84	*/
	85	//maybe we want to make this a spring component ?
85	86	public class ValidationExecutor extends ThreadPoolExecutor implements RejectedExecutionHandler {
86	87
87	88	private static final Logger logger = Logger.getLogger(ValidationExecutor.class);

     // $Id$
     /**
     * Copyright (C) 2009 EDIT
     * European Distributed Institute of Taxonomy
     * European Distributed Institute of Taxonomy
     * http://www.e-taxonomy.eu
+    *
+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
-...
     public class MonitoredListableBeanFactory extends DefaultListableBeanFactory {
     	@SuppressWarnings("unused")
     	private static final Logger logger = Logger.getLogger(MonitoredListableBeanFactory.class);
     	private boolean isInitializingBeans = false;
     	private IProgressMonitor currentMonitor;
     	private static List<String> beansToMonitor = Arrays.asList("sessionFactory","defaultBeanInitializer","persistentTermInitializer");
     	private Set<String> alreadyMonitoredBeans = new HashSet<String>();
     	private final Set<String> alreadyMonitoredBeans = new HashSet<String>();
     	public MonitoredListableBeanFactory(){
+    	}
     //	@Override
     //	protected RootBeanDefinition getMergedLocalBeanDefinition(String beanName) throws BeansException {
     //		if (registeredBeanNames.contains(beanName)){
     //			return super.getMergedLocalBeanDefinition(beanName);
     //
     //
     //		}
     ////		String message = "Handle bean '%s'";
     ////		message = String.format(message, beanName);
-...
     ////		registeredBeanNames.add(beanName);
     //		return result;
     //	}
     	public void preInstantiateSingletons() throws BeansException {
     	@Override
         public void preInstantiateSingletons() throws BeansException {
     		isInitializingBeans = true;
     		checkMonitorCancelled(currentMonitor);
     		int countBeans = 0;
-...
     //		}
     //		return result;
     //	}
     	@Override
     	protected Object createBean(final String name, final RootBeanDefinition mbd, final Object[] args){
     		boolean doMonitor = isInitializingBeans && beansToMonitor.contains(name) && !alreadyMonitoredBeans.contains(name);
     		checkMonitorCancelled(currentMonitor);
-...
     		return result;
+    	}
     	/**
     	 * @param mainMonitor the mainMonitor to set
     	 */
     	public void setCurrentMonitor(IProgressMonitor monitor) {
     		this.currentMonitor = monitor;
+    	}
     	private void checkMonitorCancelled(IProgressMonitor monitor) {
     		if (monitor != null && monitor.isCanceled()){
     			throw new CancellationException();
+    		}
+    		}
+    	}
+    }

                 TransactionStatus tx = repository.startTransaction(true);
                 //TODO what if getEntity() is not CdmBase?
                 CdmBase cdmBase = CdmBase.deproxy(getEntity(), CdmBase.class);
                 repository.getCommonService().updateEntity(cdmBase);
                 repository.getCommonService().find(cdmBase.getId());
                 //was but create Entity in 2 open sessions error
                 //not sure if the above works, should set the entity, but allowing to do so is critical the id is part of hash function, so we have to make sure that only entities with the same id can be replaced
     //            repository.getCommonService().updateEntity(cdmBase);
                 Set<ConstraintViolation<ICdmBase>> result = super.validate();
                 repository.commitTransaction(tx);
                 return result;

     import org.hibernate.service.spi.ServiceRegistryImplementor;
     import org.springframework.beans.factory.annotation.Autowired;
     import org.springframework.beans.factory.annotation.Qualifier;
     import org.springframework.context.annotation.Lazy;
     import org.springframework.stereotype.Component;
     import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
-...
+     *
      */
     @Component
     @Lazy(false)
     public class ValidationManager {
         private final boolean level2Enabled = false;
         private final boolean level3Enabled = false;
         private boolean isInitialized  = false;
         private Level2ValidationEventListener l2Listener;
         private Level3ValidationEventListener l3Listener;
-...
         @PostConstruct
         public void registerValidationListeners(){
             if (sessionFactory != null && sessionFactory instanceof SessionFactoryImpl){
                 ServiceRegistryImplementor serviceRegistry = ((SessionFactoryImpl)sessionFactory).getServiceRegistry();
             if (!isInitialized){
                 if (sessionFactory != null && sessionFactory instanceof SessionFactoryImpl){
                     ServiceRegistryImplementor serviceRegistry = ((SessionFactoryImpl)sessionFactory).getServiceRegistry();
                     final EventListenerRegistry eventRegistry = serviceRegistry.getService(EventListenerRegistry.class);
                 final EventListenerRegistry eventRegistry = serviceRegistry.getService(EventListenerRegistry.class);
                     //duplication strategy
         //            eventRegistry.addDuplicationStrategy(CdmListenerDuplicationStrategy.NewInstance);
                     eventRegistry.getEventListenerGroup(EventType.POST_INSERT);
                 //duplication strategy
     //            eventRegistry.addDuplicationStrategy(CdmListenerDuplicationStrategy.NewInstance);
                 eventRegistry.getEventListenerGroup(EventType.POST_INSERT);
                     ValidationExecutor validationExecutor = new ValidationExecutor();
                 ValidationExecutor validationExecutor = new ValidationExecutor();
                     //level2
                     l2Listener = new Level2ValidationEventListener(validationDao);
                     l2Listener.setValidationExecutor(validationExecutor);
                 //level2
                 l2Listener = new Level2ValidationEventListener(validationDao);
                 l2Listener.setValidationExecutor(validationExecutor);
                     //level3
                     l3Listener = new Level3TransactionalValidationEventListener(cdmApplicationDefaultConfiguration, validationDao);
                     l3Listener.setValidationExecutor(validationExecutor);
                 //level3
                 l3Listener = new Level3TransactionalValidationEventListener(cdmApplicationDefaultConfiguration, validationDao);
                 l3Listener.setValidationExecutor(validationExecutor);
                     // prepend to register before or append to register after
                 // prepend to register before or append to register after
                     eventRegistry.appendListeners(EventType.POST_INSERT, l2Listener , l3Listener);
                     eventRegistry.appendListeners(EventType.POST_UPDATE, l2Listener , l3Listener);
                     //TODO don't we need l2Listener validation also for deleting the results?
                     eventRegistry.appendListeners(EventType.POST_DELETE, l3Listener);
                 eventRegistry.appendListeners(EventType.POST_INSERT, l2Listener , l3Listener);
                 eventRegistry.appendListeners(EventType.POST_UPDATE, l2Listener , l3Listener);
                 //TODO don't we need l2Listener validation also for deleting the results?
                 eventRegistry.appendListeners(EventType.POST_DELETE, l3Listener);
                     isInitialized = true;
             }else{
                 throw new RuntimeException("Session factory not available or not of type SessionFactoryImpl");
                 }else{
                     throw new RuntimeException("Session factory not available or not of type SessionFactoryImpl");
+                }
+            }
+        }
         //for future use
         private void enableLevel2Listener(boolean enable){
         private void enableLevel2Listener(boolean enabled){
             l2Listener.setEnabled(enabled);
+        }
         private void enableLevel3Listener(boolean enable){
         private void enableLevel3Listener(boolean enabled){
             l3Listener.setEnabled(enabled);
+        }
+    }

       <bean id="conversationHolder" class="eu.etaxonomy.cdm.api.conversation.ConversationHolder" scope="prototype"/>
       <bean id="validationManager" class="eu.etaxonomy.cdm.api.validation.ValidationManager" scope="prototype"/>
       <bean id="validationManager" class="eu.etaxonomy.cdm.api.validation.ValidationManager"/>
       <!-- TODO move to io -->

             String path = "C:\\Users\\a.mueller\\.cdmLibrary\\writableResources\\h2\\testValidation2";
             String username = "sa";
             CdmDataSource dataSource = CdmDataSource.NewH2EmbeddedInstance("validationTest", username, "", path,   NomenclaturalCode.ICNAFP);
             dataSource = getMySQLDatasource(schema);
     //        dataSource = getMySQLDatasource(schema);
             //CdmPersistentDataSource.save(dataSource.getName(), dataSource);

Project

General

Profile

EDIT

Revision 1f31ca4f

Added by Andreas Müller over 9 years ago