Project

General

Profile

« Previous | Next » 

Revision 25b120ed

Added by Andreas Müller almost 2 years ago

ref #10089 handle RegistrationDTO with TypedEntityReference again in cdmlib

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RegistrationDTO.java
12 12
import java.util.Arrays;
13 13
import java.util.Collection;
14 14
import java.util.HashSet;
15
import java.util.LinkedHashMap;
15 16
import java.util.List;
16 17
import java.util.Map;
17 18
import java.util.Set;
......
258 259
        return name;
259 260
    }
260 261

  
261
    public Map<VersionableEntity,TypeDesignationSet> getOrderedTypeDesignationSets() {
262
        return typeDesignationSetContainer != null ? typeDesignationSetContainer.getOrderedTypeDesignationSets() : null;
262
    public Map<TypedEntityReference<? extends VersionableEntity>,TypeDesignationSet> getOrderedTypeDesignationSets() {
263
        return typeDesignationSetContainer != null ?
264
                typeDesignationSetKeyToTypedEntity(typeDesignationSetContainer.getOrderedTypeDesignationSets()) : null;
265
    }
266

  
267
    private Map<TypedEntityReference<? extends VersionableEntity>,TypeDesignationSet> typeDesignationSetKeyToTypedEntity(
268
            Map<VersionableEntity,TypeDesignationSet> orderedTypeDesignationSets) {
269
        Map<TypedEntityReference<? extends VersionableEntity>,TypeDesignationSet> result = new LinkedHashMap<>(orderedTypeDesignationSets.size());
270

  
271
        orderedTypeDesignationSets.entrySet().forEach(e->
272
            result.put(TypeDesignationSet.makeEntityReference(e.getKey()), e.getValue()));
273
        return result;
263 274
    }
264 275

  
265 276
    public TypeDesignationSet getTypeDesignationSet(VersionableEntity baseEntity) {

Also available in: Unified diff