EDIT

import org.apache.commons.beanutils.BeanUtilsBean;

import org.apache.commons.beanutils.PropertyUtilsBean;

import eu.etaxonomy.cdm.model.common.VersionableEntity;

        CdmBase proxyBean = bean;

        bean = HibernateProxyHelper.deproxy(proxyBean, CdmBase.class);

        CdmBase mappedEntity = entityyMap.put(entityKey, proxyBean);

                            // FIXME this won't work!!!!

     * <p>

     * In case the cached bean is a HibernateProxy it will be unproxied

     * before returning it.

            CDM cachedBean = (CDM) entityyMap.get(entityKey);

            if(cachedBean != null){

                return (CDM) HibernateProxyHelper.deproxy(cachedBean, CdmBase.class);

            }

        }

        return null;

    }

    private <CDM extends CdmBase> CDM findProxy(CDM value) {

        if(value != null){

            EntityKey entityKey = new EntityKey(HibernateProxyHelper.deproxy(value));

     * <p>

     * In case the cached bean is a HibernateProxy it will be unproxied

     * before returning it.

        CDM cachedBean = (CDM) entityyMap.get(entityKey);

        if(cachedBean != null){

            return (CDM) HibernateProxyHelper.deproxy(cachedBean, CdmBase.class);

        }

        return null;

    }

    @Override

    public <CDM extends CdmBase> CDM findAndUpdate(CDM value){

        CDM cachedBean = findProxy(value);

        if(cachedBean != null && VersionableEntity.class.isAssignableFrom(cachedBean.getClass())){

            updatedCachedIfEarlier((VersionableEntity)cachedBean, (VersionableEntity)value);

        }

        if(cachedBean != null){

            return (CDM) HibernateProxyHelper.deproxy(cachedBean, CdmBase.class);

        }

        return null;

    }

    /**

     * @param cachedValue

     * @param value

     */

    private <CDM extends VersionableEntity> void updatedCachedIfEarlier(CDM cachedValue, CDM value) {

       if(cachedValue != null && value != null && value.getUpdated() != null){

           if(cachedValue.getUpdated() == null || value.getUpdated().isAfter(cachedValue.getUpdated())){

               try {

                copyProperties(cachedValue, value);

            } catch (IllegalAccessException e) {

                /* should never happen */

                e.printStackTrace();

            } catch (InvocationTargetException e) {

                /* critical! re-throw as runtime exception, which is ok in the context of a vaadin app */

                throw new RuntimeException(e);

            }

           }

       }

    }

    /**

     * partially copy of {@link BeanUtilsBean#copyProperties(Object, Object)}

     */

    private <CDM extends VersionableEntity> void copyProperties(CDM dest, CDM orig) throws IllegalAccessException, InvocationTargetException {

        PropertyUtilsBean propertyUtils = BeanUtilsBean.getInstance().getPropertyUtils();

        PropertyDescriptor[] origDescriptors =

                propertyUtils.getPropertyDescriptors(orig);

            for (int i = 0; i < origDescriptors.length; i++) {

                String name = origDescriptors[i].getName();

                if ("class".equals(name)) {

                    continue; // No point in trying to set an object's class

                }

                if (propertyUtils.isReadable(orig, name) &&

                        propertyUtils.isWriteable(dest, name)) {

                    try {

                        if(CdmBase.class.isAssignableFrom(propertyUtils.getPropertyType(dest, name))){

                            CdmBase origValue = (CdmBase)propertyUtils.getSimpleProperty(orig, name);

                            if(!Hibernate.isInitialized(origValue)){

                                // ignore uninitialized entities

                                continue;

                            }

                            // only copy entities if origValue either is a completely different entity (A)

                            // or if origValue is updated (B).

                            CdmBase destValue = (CdmBase)propertyUtils.getSimpleProperty(dest, name);

                            if(destValue == null && origValue == null){

                                continue;

                            }

                            if(

                                    origValue != null && destValue == null ||

                                    origValue == null && destValue != null ||

                                    origValue.getId() != destValue.getId() ||

                                    origValue.getClass() != destValue.getClass() ||

                                    origValue.getUuid() != destValue.getUuid()){

                                // (A)

                                BeanUtilsBean.getInstance().copyProperty(dest, name, origValue);

                            } else {

                                // (B) recurse into findAndUpdate

                                findAndUpdate(origValue);

                            }

                        } else {

                                Object value = propertyUtils.getSimpleProperty(orig, name);

                                BeanUtilsBean.getInstance().copyProperty(dest, name, value);

                        }

                    } catch (NoSuchMethodException e) {

                        // Should not happen

                    }

                }

            }

/**

 * @author a.kohlbecker

 * @since Jan 4, 2018

 *

 */

     *

     * @return the cached entity if it is found in the cache otherwise null

    /**

     * Find the <code>value</code> in the cache and update it in case it

     * has an later <code>updatedWhen</code> value.

     * The properties of later updated entity will be copied over to the cached entity before it is returned.

     *

     * @param value the value to be searched in the cache

     *

     * @return the cached entity if it is found in the cache otherwise null

     */

    public <CDM extends CdmBase> CDM findAndUpdate(CDM value);

            "name.homotypicalGroup.typifiedNames",

            CDM cachedEntity = cache.findAndUpdate(value);

import java.util.Arrays;

import java.util.HashSet;

import java.util.Set;

import eu.etaxonomy.cdm.vaadin.event.EntityChangeEvent;

    private Set<CollectionRowItemCollection> collectionPopuEditorSourceRows = new HashSet<>();

        collectionPopuEditorSourceRows.clear();

                row.collection.addClickListenerAddEntity( e -> doCollectionEditorAdd());

                            doCollectionEditorEdit(row.collection.getValue().getId());

                collectionPopuEditorSourceRows.add(row);

    public void doCollectionEditorAdd() {

    public void doCollectionEditorEdit(int collectionId) {

    @EventListener(condition = "#event.entityType == T(eu.etaxonomy.cdm.model.occurrence.Collection)")

    public void onCollectionEvent(EntityChangeEvent event){

        Collection newCollection = getRepo().getCollectionService().load(event.getEntityId(), Arrays.asList(new String[]{"$.institute"}));

        cache.findAndUpdate(newCollection);

        for( CollectionRowItemCollection row : collectionPopuEditorSourceRows) {

            ToOneRelatedEntityCombobox<Collection> combobox = row.getComponent(ToOneRelatedEntityCombobox.class, 2);

            combobox.reload();

import eu.etaxonomy.cdm.vaadin.component.common.TeamOrPersonField;

    public TeamOrPersonField getAuthorshipField();

     * reload the selected entity from the persistent storage

     */

    public void reload() {

        getSelect().refresh();

        getSelect().discard(); // reload from data source

    }

    /**

        lazySelect.setValue(newFieldValue);

import org.joda.time.DateTime;

    public void entityKeyTest() {

    @Test

    public void testFindOrUpdate() {

        Collection collection = Collection.NewInstance();

        collection.setId(10);

        collection.setCode("A");

        CdmEntityCache cache = new CdmEntityCache(collection);

        Assert.assertEquals(collection, cache.find(Collection.class, 10));

        Assert.assertEquals("A", cache.find(Collection.class, 10).getCode());

        Collection copyCollection = collection.clone();

        copyCollection.setId(collection.getId()); // clone does not copy the id!

        copyCollection.setUuid(collection.getUuid());

        copyCollection.setCode("B");

        copyCollection.setUpdated(new DateTime(2017, 12, 1, 0, 0));

        Assert.assertEquals("B", cache.findAndUpdate(copyCollection).getCode());

        copyCollection = collection.clone();

        copyCollection.setId(10); // clone does not copy the id!

        copyCollection.setUuid(collection.getUuid());

        copyCollection.setCode("C");

        copyCollection.setUpdated(new DateTime(2018, 1, 1, 0, 0));

        Assert.assertEquals("C", cache.findAndUpdate(copyCollection).getCode());

    }

import eu.etaxonomy.cdm.vaadin.component.common.TeamOrPersonField;

        /**

         * {@inheritDoc}

         */

        @Override

        public TeamOrPersonField getAuthorshipField() {

            return null;

        }