Project

General

Profile

Revision ec95ad8e

IDec95ad8e52fae2e963bbfbf5400ac9443c0ee636
Parent ab4b0d27
Child 6baf8c40

Added by Patrick Plitzner about 2 years ago

ref #7887 Change idInVocabulary to String

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/TermDto.java
33 33
    private UUID partOfUuid = null;
34 34
    private UUID vocabularyUuid = null;
35 35
    private Integer orderIndex = null;
36
    private Integer idInVocabulary = null;
36
    private String idInVocabulary = null;
37 37
    private Collection<TermDto> includes;
38 38

  
39 39
    public TermDto(UUID uuid, Set<Representation> representations, Integer orderIndex) {
......
45 45
        this(uuid, representations, partOfUuid, null, vocabularyUuid, orderIndex, null);
46 46
    }
47 47

  
48
    public TermDto(UUID uuid, Set<Representation> representations, UUID partOfUuid, UUID kindOfUuid, UUID vocabularyUuid, Integer orderIndex, Integer idInVocabulary) {
48
    public TermDto(UUID uuid, Set<Representation> representations, UUID partOfUuid, UUID kindOfUuid, UUID vocabularyUuid, Integer orderIndex, String idInVocabulary) {
49 49
        super(uuid, representations);
50 50
        this.partOfUuid = partOfUuid;
51 51
        this.kindOfUuid = kindOfUuid;
......
83 83
        this.orderIndex = orderIndex;
84 84
    }
85 85

  
86
    public Integer getIdInVocabulary() {
86
    public String getIdInVocabulary() {
87 87
        return idInVocabulary;
88 88
    }
89 89

  
90
    public void setIdInVocabulary(Integer idInVocabulary) {
90
    public void setIdInVocabulary(String idInVocabulary) {
91 91
        this.idInVocabulary = idInVocabulary;
92 92
    }
93 93

  
......
101 101

  
102 102
    public static String getTermDtoSelect(){
103 103
        return ""
104
                + "select a.uuid, r, p.uuid, k.uuid, v.uuid, a.idInVocabulary, a.orderIndex "
104
                + "select a.uuid, r, p.uuid, k.uuid, v.uuid, a.orderIndex, a.idInVocabulary "
105 105
                + "from DefinedTermBase as a "
106 106
                + "LEFT JOIN a.partOf as p "
107 107
                + "LEFT JOIN a.kindOf as k "
......
123 123
                } else {
124 124
                    representations = (Set<Representation>)elements[1];
125 125
                }
126
                dtoMap.put(uuid, new TermDto(uuid, representations, (UUID)elements[2], (UUID)elements[3], (UUID)elements[4], (Integer)elements[5], (Integer)elements[6]));
126
                dtoMap.put(uuid, new TermDto(uuid, representations, (UUID)elements[2], (UUID)elements[3], (UUID)elements[4], (Integer)elements[5], (String)elements[6]));
127 127
            }
128 128
        }
129 129
        return new ArrayList<>(dtoMap.values());

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)