Revision 7ab5b913
Added by Andreas Müller about 2 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/URIUserType.java | ||
---|---|---|
65 | 65 |
@Override |
66 | 66 |
public void nullSafeSet(PreparedStatement statement, Object value, int index, SessionImplementor session) |
67 | 67 |
throws HibernateException, SQLException { |
68 |
if (value == null) {
|
|
69 |
StandardBasicTypes.STRING.nullSafeSet(statement, value, index, session);
|
|
70 |
} else { |
|
71 |
URI uri = (URI) value;
|
|
72 |
StandardBasicTypes.STRING.nullSafeSet(statement, uri.toString(), index, session); |
|
73 |
} |
|
74 |
}
|
|
68 |
if (value == null) {
|
|
69 |
StandardBasicTypes.STRING.nullSafeSet(statement, value, index, session);
|
|
70 |
} else {
|
|
71 |
URI uri = (URI) value;
|
|
72 |
StandardBasicTypes.STRING.nullSafeSet(statement, uri.toString(), index, session);
|
|
73 |
}
|
|
74 |
}
|
|
75 | 75 |
|
76 | 76 |
/** |
77 | 77 |
* @param value value being copied |
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermNode.java | ||
---|---|---|
87 | 87 |
@JoinColumn(name="parent_id") |
88 | 88 |
private TermNode<T> parent; |
89 | 89 |
|
90 |
|
|
91 | 90 |
@XmlElement(name = "treeIndex") |
92 | 91 |
@Column(length=255) |
93 | 92 |
private String treeIndex; |
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermNodeServiceImpl.java | ||
---|---|---|
11 | 11 |
|
12 | 12 |
import java.util.ArrayList; |
13 | 13 |
import java.util.HashSet; |
14 |
import java.util.Iterator; |
|
15 | 14 |
import java.util.List; |
16 | 15 |
import java.util.Map; |
17 | 16 |
import java.util.Map.Entry; |
... | ... | |
257 | 256 |
return result; |
258 | 257 |
} |
259 | 258 |
|
260 |
|
|
261 |
|
|
262 | 259 |
@Override |
263 | 260 |
public UpdateResult saveCharacterNodeDtoList(List<CharacterNodeDto> dtos){ |
264 | 261 |
MergeResult<TermNode> mergeResult; |
... | ... | |
268 | 265 |
dtos.stream().forEach(dto -> nodeUuids.add(dto.getUuid())); |
269 | 266 |
List<TermNode> nodes = dao.list(nodeUuids, null, 0, null, null); |
270 | 267 |
//check all attributes for changes and adapt |
271 |
Iterator<CharacterNodeDto> dtoIterator = dtos.iterator(); |
|
272 | 268 |
for (TermNode<Character> node: nodes){ |
273 | 269 |
for (CharacterNodeDto dto: dtos){ |
274 | 270 |
// TermNodeDto dto = dtoIterator.next(); |
... | ... | |
323 | 319 |
for (Representation rep: deleteRepresentations){ |
324 | 320 |
character.removeRepresentation(rep); |
325 | 321 |
} |
326 |
|
|
327 | 322 |
} |
328 | 323 |
|
329 | 324 |
// structural modifier |
... | ... | |
359 | 354 |
if (!uuids.isEmpty()){ |
360 | 355 |
terms = termService.load(uuids, null); |
361 | 356 |
Set<StatisticalMeasure> statisticalMeasures = new HashSet<>(); |
362 |
for (DefinedTermBase term: terms){ |
|
357 |
for (DefinedTermBase<?> term: terms){
|
|
363 | 358 |
if (term instanceof StatisticalMeasure){ |
364 | 359 |
statisticalMeasures.add((StatisticalMeasure)term); |
365 | 360 |
} |
... | ... | |
397 | 392 |
node.setTerm(character); |
398 | 393 |
mergeResult = dao.merge(node, true); |
399 | 394 |
result.addUpdatedObject(mergeResult.getMergedEntity()); |
400 |
|
|
401 | 395 |
} |
402 |
|
|
403 | 396 |
} |
404 |
|
|
405 | 397 |
} |
406 | 398 |
return result; |
407 | 399 |
} |
Also available in: Unified diff
cleanup