/ - Diff - EDIT - EDIT Project Management

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/api/application/CdmIoApplicationController.java
16	16
17	17
18	18	public static final String DEFAULT_APPLICATION_CONTEXT_RESOURCE = "/eu/etaxonomy/cdm/defaultIoApplicationContext.xml";
19
20
	19
	20
21	21	public static CdmIoApplicationController NewInstance() throws DataSourceNotFoundException {
22	22	return CdmIoApplicationController.NewInstance(getDefaultDatasource(), defaultDbSchemaValidation, false);
23	23	}
24
	24
25	25	public static CdmIoApplicationController NewInstance(DbSchemaValidation dbSchemaValidation) throws DataSourceNotFoundException {
26	26	return CdmIoApplicationController.NewInstance(getDefaultDatasource(), dbSchemaValidation, false);
27	27	}
28
	28
29	29	/**
30	30	* Constructor, opens an spring ApplicationContext by using the according data source and the
31	31	* default database schema validation type
...	...
35	35	return CdmIoApplicationController.NewInstance(dataSource, defaultDbSchemaValidation, false);
36	36	}
37	37
38
	38
39	39	public static CdmIoApplicationController NewInstance(ICdmDataSource dataSource, DbSchemaValidation dbSchemaValidation) {
40	40	return CdmIoApplicationController.NewInstance(dataSource, dbSchemaValidation, false);
41	41	}
...	...
65	65	super(applicationContextResource, dataSource, dbSchemaValidation, omitTermLoading, progressMonitor, null);
66	66
67	67	}
68
	68
69	69	}

     	public ICdmRepository getCdmAppController() {
     		return this.cdmApp;
+    	}
     	/**
     	 * @param cdmApp
     	 *            the cdmApp to set
     	 * @see #getCdmAppController()
     	 */
     	public void setCdmAppController(ICdmRepository cdmApp) {
     		this.cdmApp = cdmApp;

     /**
     * Copyright (C) 2008 EDIT
     * European Distributed Institute of Taxonomy
     * European Distributed Institute of Taxonomy
     * http://www.e-taxonomy.eu
     */
-...
     	 * @return String representing the source for the io
     	 */
     	public String getSourceNameString();
     	/**
     	 * A String representation of the destination may it be an import destination and therefore a CDM (e.g. CDM Cichorieae Database)
-...
     	 * @return
     	 */
     	public String getDestinationNameString();
     	/**
     	 * Returns the CdmApplicationController
     	 * @return
     	 */
     	public ICdmRepository getCdmAppController();
     	/**
     	 * Sets the CdmApplicationController
     	 * @param cdmApp the cdmApp to set
-...
     	/**
     	 * Get the way how the CDM schema is validated
     	 * For exports values that delete the source (CREATE, CREATE_DROP) are not allowed and may throw an
     	 * For exports values that delete the source (CREATE, CREATE_DROP) are not allowed and may throw an
     	 * Exception in the further run
     	 * @see eu.etaxonomy.cdm.database.DbSchemaValidation
     	 * @param dbSchemaValidation
     	 */
     	public void setDbSchemaValidation(DbSchemaValidation dbSchemaValidation);
     	/**
     	 * Returns the progress monitor.
     	 * @return
     	 */
     	public IProgressMonitor getProgressMonitor();
     	/**
     	 * Sets the progress monitor.
     	 * @see #getProgressMonitor()
-...
     	 * Returns the observers for this import/export
     	 * @return
     	 */
     	public Set<IIoObserver> getObservers();
     	@Override
         public Set<IIoObserver> getObservers();
     	/**
     	 * Sets the observers for this import/export
     	 * @param observers
     	 */
     	public void setObservers(Set<IIoObserver> observers);
     	public UsernamePasswordAuthenticationToken getAuthenticationToken();
     	public void setAuthenticationToken(UsernamePasswordAuthenticationToken token);
     	public void setAuthentication(String login, String password);
     	/**
     	 * Creates the UsernamePasswordAuthenticationToken for the default admin.
+    	 *
+    	 *
     	 * @see Configuration#adminLogin
     	 * @see Configuration#adminPassword
     	 */

     //	private Set<IIoObserver> observers = new HashSet<>();
     	//etc
         //etc
     	private IProgressMonitor progressMonitor;
-...
     		this.authenticationToken = token;
+    	}
     	/* (non-Javadoc)
     	 * @see eu.etaxonomy.cdm.io.common.IIoConfigurator#authenticateAsDefaultAdmin()
     	 */
     	@Override
     	public void authenticateAsDefaultAdmin() {
     		setAuthentication(Configuration.adminLogin, Configuration.adminPassword);

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonCsv2CdmTaxonRelationConverter.java
58	58	if (!config.isDoSplitRelationshipImport()){
59	59	return null;
60	60	}else{
61		return new DwcTaxonStreamItem2CdmTaxonConverter(state, true); //the converter also is implementing the ItemFilter interfacem, this way we guarantee that the evaluation if the item is a synonym, lower or higher taxon is the same during taxon creation and relationship creation
	61	return new DwcTaxonStreamItem2CdmTaxonConverter<>(state, true); //the converter also is implementing the ItemFilter interfacem, this way we guarantee that the evaluation if the item is a synonym, lower or higher taxon is the same during taxon creation and relationship creation
62	62	}
63	63	}
64	64

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcTaxonStreamItem2CdmTaxonConverter.java
140	140	MappedCdmBase<Reference> sec = getNameAccordingTo(csvTaxonRecord, resultList);
141	141
142	142	if (sec == null && state.getConfig().isUseSourceReferenceAsSec()){
143		sec = new MappedCdmBase<Reference>(state.getTransactionalSourceReference());
	143	sec = new MappedCdmBase<>(state.getTransactionalSourceReference());
144	144	}
145	145	if (sec != null){
146	146	taxonBase.setSec(sec.getCdmBase());
...	...
252	252	taxon.addSource(OriginalSourceType.Import, id, idNamespace, ref, null);
253	253	}
254	254
255
256
257	255	}
258	256
259	257

     /**
     * 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.
     */
-...
     import eu.etaxonomy.cdm.io.stream.StreamImportBase;
     /**
+     *
+     *
      * @author a.mueller
+     *
      */
     public abstract class DwcaDataImportBase<CONFIG extends DwcaDataImportConfiguratorBase<STATE>, STATE extends DwcaDataImportStateBase<CONFIG>> extends StreamImportBase<CONFIG, STATE>{
     	@SuppressWarnings("unused")
         private static final long serialVersionUID = 8816075241549849925L;
         @SuppressWarnings("unused")
     	private static final Logger logger = Logger.getLogger(DwcaDataImportBase.class);
     	@Override
     	protected void finalizeStream(IItemStream itemStream, STATE state) {
     		fireWarningEvent("Stream finished", itemStream.getStreamLocation(), 0);
-...
+    			}
+    		}
+    	}
+    }

      * @author a.mueller
      * @created 04.06.2013
      */
     public abstract class DwcaDataImportConfiguratorBase<STATE extends DwcaDataImportStateBase> extends StreamImportConfiguratorBase<STATE, URI> implements IImportConfigurator {
     public abstract class DwcaDataImportConfiguratorBase<STATE extends DwcaDataImportStateBase>
             extends StreamImportConfiguratorBase<STATE, URI> implements IImportConfigurator {
     	@SuppressWarnings("unused")
     	private static final Logger logger = Logger.getLogger(DwcaDataImportConfiguratorBase.class);
     //	private static IInputTransformer defaultTransformer = new DwcaImportTransformer();

     /**
     * Copyright (C) 2007 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.
     */
-...
      * @author a.mueller
      * @created 23.11.2011
      */
     public abstract class DwcaDataImportStateBase<CONFIG extends DwcaDataImportConfiguratorBase> extends StreamImportStateBase<CONFIG, StreamImportBase>{
     public abstract class DwcaDataImportStateBase<CONFIG extends DwcaDataImportConfiguratorBase>
             extends StreamImportStateBase<CONFIG, StreamImportBase>{
     	@SuppressWarnings("unused")
     	private static final Logger logger = Logger.getLogger(DwcaDataImportStateBase.class);

     	protected IPartitionableConverter<StreamItem,IReader<CdmBase>, String> getConverter(TermUri namespace, DwcaImportState state) {
     		if (namespace.equals(TermUri.DWC_TAXON)){
     			if (state.getConfig().isDoTaxa() && ! state.isTaxaCreated()){
     				return new DwcTaxonStreamItem2CdmTaxonConverter(state);
     				return new DwcTaxonStreamItem2CdmTaxonConverter<>(state);
     			}else{
     				return new DwcTaxonCsv2CdmTaxonRelationConverter(state);
+    			}

      * @author a.mueller
      * @created 05.05.2011
      */
     public class DwcaImportConfigurator extends DwcaDataImportConfiguratorBase<DwcaImportState> implements IImportConfigurator {
     public class DwcaImportConfigurator
             extends DwcaDataImportConfiguratorBase<DwcaImportState>
             implements IImportConfigurator {
         private static final long serialVersionUID = 6932718596034946336L;
         @SuppressWarnings("unused")

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/in/DwcaImportState.java
22	22	public DwcaImportState(DwcaImportConfigurator config) {
23	23	super(config);
24	24	}
25
26
27	25	}

     /**
     * Copyright (C) 2007 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.
     */
-...
      * @created 05.05.2011
      */
     public final class DwcaImportTransformer extends InputTransformerBase {
     	@SuppressWarnings("unused")
         private static final long serialVersionUID = 3204045957159056826L;
         @SuppressWarnings("unused")
     	private static final Logger logger = Logger.getLogger(DwcaImportTransformer.class);
     	private static final UUID uuidFeatureBiology = UUID.fromString("daf92173-a262-49f1-9a45-923941d9c557");
     	/* (non-Javadoc)
     	 * @see eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase#getFeatureByKey(java.lang.String)
     	 */
-...
     		}else if (key.equalsIgnoreCase("uses")){
     			return Feature.USES();
+    		}
     		return null;
+    	}
     	/* (non-Javadoc)
     	 * @see eu.etaxonomy.cdm.io.common.mapping.InputTransformerBase#getFeatureUuid(java.lang.String)
     	 */
     	@Override
     	public UUID getFeatureUuid(String key) throws UndefinedTransformerMethodException {
     		if (key == null){
-...
     //		threats
     //		cyclicity
     //		management
     //
     //
     //		evolution
     //		genetics
     //		growth
-...
     //		taxon_biology
     //		trophic_strategy
     		return null;
+    	}
+    }

     	);
     	private final URI dwcaZip;
     	private final Map<String, DwcaMetaDataRecord> metaRecords = new HashMap<String, DwcaMetaDataRecord>();
     	private final Map<String, DwcaMetaDataRecord> metaRecords = new HashMap<>();
     	private Archive archive;
     /// ******************** FACTORY ********************************/
     	public static DwcaZipToStreamConverter NewInstance(URI dwcaZip){
     	public static DwcaZipToStreamConverter<DwcaImportState> NewInstance(URI dwcaZip){
     		return new DwcaZipToStreamConverter(dwcaZip);
+    	}

     	 * @param list
     	 */
     	public ListReader(List<TYPE> list) {
     		this.list = new ArrayList<TYPE>();
     		this.list = new ArrayList<>();
     		this.list.addAll(list);
+    	}

     	@SuppressWarnings("unused")
     	private static final Logger logger = Logger.getLogger(LookAheadStream.class);
     	private final Queue<ITEM> fifo = new LinkedBlockingQueue<ITEM>();
     	private final Queue<ITEM> fifo = new LinkedBlockingQueue<>();
     	private final INamespaceReader<ITEM> stream;

     /**
     * 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 MappedCdmBase<CDMBASE extends CdmBase> {
     	private String namespace;
     	private String sourceId;
     	private CDMBASE cdmBase;
     	public MappedCdmBase(String namespace, String sourceId, CDMBASE cdmBase) {
-...
     		this.sourceId = sourceId;
     		this.cdmBase = cdmBase;
+    	}
     	public MappedCdmBase(TermUri termUri, String sourceId, CDMBASE cdmBase) {
     		super();
     		this.namespace = termUri.toString();
     		this.sourceId = sourceId;
     		this.cdmBase = cdmBase;
+    	}
     	public MappedCdmBase(String sourceId, CDMBASE cdmBase) {
     		super();
     		this.namespace = null;
     		this.sourceId = sourceId;
     		this.cdmBase = cdmBase;
+    	}
     	public MappedCdmBase(CDMBASE cdmBase) {
     		super();
     		this.namespace = null;
-...
     	public CDMBASE getCdmBase() {
     		return cdmBase;
+    	}
     	public boolean isMappable(){
     		return (this.namespace != null && this.sourceId != null && this.cdmBase != null);
+    	}
     	public String toString(){
     	@Override
         public String toString(){
     		String result = CdmUtils.concat("@", new String[]{namespace, sourceId, cdmBase.toString()});
     		return result;
+    	}
+    }

     	@Override
         public Map<String, Set<String>> getPartitionForeignKeys(IReader<StreamItem> instream) {
     		Map<String, Set<String>> result = new HashMap<String, Set<String>>();
     		Map<String, Set<String>> result = new HashMap<>();
     		while (instream.hasNext()){
     			StreamItem next = instream.read();
-...
+    	}
     	protected <T extends TaxonBase> T getTaxonBase(String id, StreamItem item, Class<T> clazz, STATE state) {
     	protected <T extends TaxonBase<?>> T getTaxonBase(String id, StreamItem item, Class<T> clazz, STATE state) {
     		if (clazz == null){
     			clazz = (Class)TaxonBase.class;
     			clazz = (Class<T>)TaxonBase.class;
+    		}
     		List<T> taxonList = state.get(TermUri.DWC_TAXON.toString(), id, clazz);
     		if (taxonList.size() > 1){

     	private final StreamImportStateBase<StreamImportConfiguratorBase, StreamImportBase> state;
     	private ConcatenatingReader<MappedCdmBase<? extends CdmBase>> outStream;
     	public StreamPartitioner(INamespaceReader<ITEM> input, IPartitionableConverter converter, StreamImportStateBase state, Integer size){
     		 this.inStream = new LookAheadStream<ITEM>(input);
     	public StreamPartitioner(INamespaceReader<ITEM> input, IPartitionableConverter converter,
     	        StreamImportStateBase<StreamImportConfiguratorBase, StreamImportBase> state, Integer size){
     		 this.inStream = new LookAheadStream<>(input);
     		 this.converter = converter;
     		 this.partitionSize = size;
     		 this.state = state;
-...
+    	}
     	private void handleNextPartition(){
     	    List<ITEM> lookaheadArray = new ArrayList<ITEM>();
     	    List<ITEM> lookaheadArray = new ArrayList<>();
     		while (this.inStream.hasNextLookAhead(partitionSize)){
     			lookaheadArray.add(this.inStream.readLookAhead());
+    		}
     		IReader<ITEM> lookaheadStream = new ListReader<ITEM>(lookaheadArray);
     		IReader<ITEM> lookaheadStream = new ListReader<>(lookaheadArray);
     		Map<String, Set<String>> foreignKeys = converter.getPartitionForeignKeys(lookaheadStream);
     		IImportMapping mapping = state.getMapping();
-...
     			if (cdmBase.isInstanceOf(IdentifiableEntity.class)){
     			    Set<String> requiredSourceNamespaces = converter.requiredSourceNamespaces();
     				if (requiredSourceNamespaces.contains(item.getNamespace())){
     					if (item.getCdmBase().isInstanceOf(IdentifiableEntity.class)) {
     					    IdentifiableEntity identEntity = CdmBase.deproxy(item.getCdmBase(), IdentifiableEntity.class);
                             state.addRelatedObject(item.getNamespace(), item.getSourceId(), identEntity);
                         }else{
+                        }
     					state.addRelatedObject(item.getNamespace(), item.getSourceId(), item.getCdmBase());
+    				}
+    			}
+    		}

     			ItemFilter<StreamItem> filter = partitionConverter.getItemFilter();
     			IItemStream filteredStream = filter == null ? recordStream : new FilteredStream(recordStream, filter);
     			StreamPartitioner<StreamItem> partitionStream = new StreamPartitioner<>(filteredStream,
     			StreamPartitioner<StreamItem> partitionStream = new StreamPartitioner(filteredStream,
     					partitionConverter, state, partitionSize);//   (csvStream, streamConverter,state 1000);
     			int i = 1;

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/stream/StreamImportConfiguratorBase.java
91	91	public boolean isUsePartitions() {
92	92	return usePartitions;
93	93	}
94
95	94	public void setUsePartitions(boolean usePartitions) {
96	95	this.usePartitions = usePartitions;
97	96	}
...	...
99	98	public void setDefaultPartitionSize(int defaultPartitionSize) {
100	99	this.defaultPartitionSize = defaultPartitionSize;
101	100	}
102
103	101	public int getDefaultPartitionSize() {
104	102	return defaultPartitionSize;
105	103	}
...	...
107	105	public IImportMapping.MappingType getMappingType() {
108	106	return mappingType;
109	107	}
110
111	108	public void setMappingType(IImportMapping.MappingType mappingType) {
112	109	this.mappingType = mappingType;
113	110	}
...	...
123	120	}
124	121
125	122
126		/**
127		* @return the databaseMappingFile
128		*/
129	123	public String getDatabaseMappingFile() {
130	124	return databaseMappingFile;
131	125	}
132
133		/**
134		* @param databaseMappingFile the databaseMappingFile to set
135		*/
136	126	public void setDatabaseMappingFile(String databaseMappingFile) {
137	127	this.databaseMappingFile = databaseMappingFile;
138	128	}
139	129
140	130
141		/**
142		* @return the stateUuid
143		*/
144	131	public UUID getStateUuid() {
145	132	return stateUuid;
146	133	}
147		/**
148		* @param stateuuid
149		*/
150	134	public void setStateUuid(UUID stateUuid) {
151	135	this.stateUuid = stateUuid;
152	136	}

     import org.apache.log4j.Logger;
     import org.hibernate.cache.internal.NoCachingRegionFactory;
     import org.hibernate.cache.spi.RegionFactory;
     import org.hibernate.cfg.Environment;
     import org.springframework.beans.MutablePropertyValues;
     import org.springframework.beans.factory.config.BeanDefinition;
     import org.springframework.beans.factory.config.PropertiesFactoryBean;
-...
     		while (keys.hasMoreElements()){
     			String key = (String)keys.nextElement();
     			props.addPropertyValue(key, persistentProperties.getProperty(key));
     			Properties a = Environment.getProperties();
     //			Properties a = Environment.getProperties();
+    		}
     		bd.setPropertyValues(props);

     /**
     * Copyright (C) 2007 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.
     */
-...
     	 * @return BeanDefinition
     	 */
     	public BeanDefinition getDatasourceBean();
     	/**
     	 * @param hbm2dll
     	 * @return BeanDefinition
     	 */
     	public BeanDefinition getHibernatePropertiesBean(DbSchemaValidation hbm2dll);
     	/**
     	 * @param hbm2dll
     	 * @param showSql
-...
     	public BeanDefinition getHibernatePropertiesBean(DbSchemaValidation hbm2dll, Boolean showSql, Boolean formatSql, Boolean registerSearchListener, Class<? extends RegionFactory> cacheProviderClass);
     	/**
     	 * @return
     	 */
-...
     	 * @return
     	 */
     	public H2Mode getMode();
     	public String getUsername();
     	public String getPassword();
     	public String getDatabase();
     	public void setMode(H2Mode h2Mode);
     	public void setUsername(String username);
     	public void setPassword(String password);
     	public void setDatabase(String database);
     	/**
     	 * Returns the database type of the data source.
     	 * @return the database type of the data source.
     	 * Returns the database type of the data source.
     	 * @return the database type of the data source.
     	 * <code>null</code> if the bean or the driver class property does not exist or the driver class is unknown.
     	 */
     	public DatabaseTypeEnum getDatabaseType();
     	/**
     	 * Tests, if a database connection can be established.
     	 * @return true if test was successful, false otherwise
     	 * @throws ClassNotFoundException
     	 * @throws SQLException
     	 * @throws Exception
     	 * @throws ClassNotFoundException
     	 * @throws SQLException
     	 * @throws Exception
     	 */
     	public boolean testConnection() throws ClassNotFoundException, SQLException;
     	 /**
          * Executes a query and returns the ResultSet.
          * @return ResultSet for the query.
     	 * @throws SQLException
     	 * @throws SQLException
          */
     	public ResultSet executeQuery (String query) throws SQLException;
         /**
          * Executes an update
          * @return return code
          */
     	public int executeUpdate (String sqlUpdate) throws SQLException;
     	/**
     	 * Starts a transaction for the given datasource.
     	 */
     	public void startTransaction();
     	/**
     	 * Commits the transaction for the given datasource.
     	 * @return
     	 * @throws SQLException
     	 * @throws SQLException
     	 */
     	public void commitTransaction() throws SQLException;
     	/**
     	 * Rolls the connection back.
     	 * @throws SQLException
     	 * @throws SQLException
     	 */
     	public void rollback() throws SQLException;
-...
     	 * Returns the first value of the first row of a result set.<BR>
     	 * If no row exists in the result set
     	 * <code>null</code> is returned.
+    	 *
+    	 *
     	 * <strong>Caution</strong> This method opens a connection on first use. Subsequent calls will use the same connection.
     	 * Please close the connection when not needed anymore with {@link ICdmDataSource#closeOpenConnections()}
+    	 *
+    	 *
     	 * @param query
     	 * @return
     	 * @throws SQLException
     	 */
     	public Object getSingleValue(String query) throws SQLException;
     	public Object getSingleValue(String query) throws SQLException;
     	/**
     	 * Returns {@link DatabaseMetaData} for <code>this</code> datasource.
+    	 *
+    	 *
     	 * <br>
     	 * <br>
     	 * <strong>Caution</strong> This method opens a connection that should be closed
     	 * with {@link #closeOpenConnections()}
+    	 *
+    	 *
     	 * @return
     	 */
     	public DatabaseMetaData getMetaData();

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/WrappedCdmDataSource.java
396	396	throw new RuntimeException(e);
397	397	}
398	398	}
	399
399	400	}

     import org.hibernate.proxy.HibernateProxy;
     import org.springframework.beans.factory.annotation.Autowired;
     import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
     import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
     import eu.etaxonomy.cdm.model.common.CdmBase;
     import eu.etaxonomy.cdm.persistence.dao.common.ICdmGenericDao;
     import eu.etaxonomy.cdm.persistence.dao.hibernate.HibernateBeanInitializer;
     import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
     /**
      * For now this is a test if we can improve performance for bean initializing
-...
                 //TODO check if other code works with audited data at all as we use HQL queries
                 if (!node.hasWildcardToManySibling()){  //if wildcard sibling exists the lazies are already prepared there
                     Collection<?> collection = (Collection<?>)propertyValue;
                     //TODO it is difficult to find out if an envers collection is initiallized
                     //but possiblie via reflection. If the "delegate" parameter is null it is not yet initialized.
                     //TODO it is difficult to find out if an envers collection is initialized
                     //but possibly via reflection. If the "delegate" parameter is null it is not yet initialized.
                     //However, as we do not know if envers initialization works at all together with the AdvancedBeanInitializer
                     //we initialize each collection immediately here by calling size()
                     collection.size();  //initialize

+     *
      * @author n.hoffmann
      * @created 24.03.2009
      * @version 1.0
      */
     public class CdmPostDataChangeObservableListener implements
     		  PostDeleteEventListener
-...
     	/**
     	 * Observing objects
     	 */
     	private final Set<ICdmPostDataChangeObserver> observers = new HashSet<ICdmPostDataChangeObserver>();
     	private final Set<ICdmPostDataChangeObserver> observers = new HashSet<>();
     	/**
-...
     	public void delayedNotify(){
     		if(delayed && changeEvents.size() > 0){
     			Set<ICdmPostDataChangeObserver> modificationSaveObservers
     						= new HashSet<ICdmPostDataChangeObserver>(observers);
     						= new HashSet<>(observers);
     			for( ICdmPostDataChangeObserver observer : modificationSaveObservers){
     				observer.update(changeEvents);
+    			}

     public class PostMergeEntityListener implements MergeEventListener {
         private static final long serialVersionUID = 1565797119368313987L;
         private static Map<Session, Set<CdmBase>> newEntitiesMap = new ConcurrentHashMap<Session, Set<CdmBase>>();
         private static Map<Session, Set<CdmBase>> newEntitiesMap = new ConcurrentHashMap<>();
         public static void addSession(Session session) {
             newEntitiesMap.put(session, new HashSet<CdmBase>());
             newEntitiesMap.put(session, new HashSet<>());
+        }
         public static void removeSession(Session session) {

     		init();
+    	}
     	/*
     	 * (non-Javadoc)
+    	 *
     	 * @see java.lang.Object#finalize()
     	 */
     	@Override
     	public void finalize(){
     		close();
+    	}
     	/**
     	 * closes the application
     	 */

     	private IProgressMonitor currentMonitor;
     	private static List<String> beansToMonitor = Arrays.asList("sessionFactory","defaultBeanInitializer","persistentTermInitializer");
     	private final Set<String> alreadyMonitoredBeans = new HashSet<String>();
     	private final Set<String> alreadyMonitoredBeans = new HashSet<>();
     	public MonitoredListableBeanFactory(){
+    	}

Project

General

Profile

EDIT

Revision 337563aa

Added by Andreas Müller over 6 years ago