Project

General

Profile

« Previous | Next » 

Revision 7b2e142b

Added by Andreas Müller over 5 years ago

ref #7709 use CdmBase constructor instead of class and id

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ConversationalTransientEntityCacher.java
49 49
        // if the cdm identifier set contains identifiers of objects already
50 50
        // present in the updated objects set reomve them
51 51
        for(CdmBase updatedObject : updatedObjects) {
52
            if(updatedObject != null && super.exists(new CdmEntityCacheKey(updatedObject.getClass(), updatedObject.getId()))) {
52
            if(updatedObject != null && super.exists(new CdmEntityCacheKey<>(updatedObject))) {
53 53
                CdmEntityIdentifier cdmEntityIdentifier = new CdmEntityIdentifier(updatedObject.getId(), updatedObject.getClass());
54 54
                if(!updatedCdmIdsIsEmpty && updatedCdmIds.contains(cdmEntityIdentifier)) {
55 55
                    updatedCdmIds.remove(cdmEntityIdentifier);
......
62 62
        // in the cache
63 63

  
64 64
        for(CdmEntityIdentifier cei : updatedCdmIds) {
65
            if(exists(new CdmEntityCacheKey(cei.getCdmClass(), cei.getId()))) {
65
            if(exists(new CdmEntityCacheKey<>(cei.getCdmClass(), cei.getUuid()))) {
66 66
                reloadedObjects.add(load(cei, update));
67 67
            }
68 68

  
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/cdm/api/cache/CdmClientCachingTest.java
152 152
        KeyStatement ks2 = CdmBase.deproxy(pkey2.getRoot().getStatement(), KeyStatement.class);
153 153

  
154 154
        Assert.assertSame(ks2, cacher.getFromCache(ks2));
155
        Assert.assertSame(cacher.getFromCache(KeyStatement.class, ks1.getId()), cacher.getFromCache(ks2));
155
        Assert.assertSame(cacher.getFromCache(ks1), cacher.getFromCache(ks2));
156 156

  
157 157
    }
158 158

  

Also available in: Unified diff