Project

General

Profile

« Previous | Next » 

Revision 49029

getting rid of person entities

View differences:

XmlRecordFactory.java
351 351
			}
352 352

  
353 353
			if (defaults) {
354
				final Iterable<FieldDescriptor> unseen = Iterables.filter(fields.getDescriptorForType().getFields(), new Predicate<FieldDescriptor>() {
355
					@Override
356
					public boolean apply(final FieldDescriptor fd) {
357
						return !seen.contains(fd.getName()) && filter.apply(fd.getName());
358
					}
359
				});
354
				final Iterable<FieldDescriptor> unseen =
355
						Iterables.filter(fields.getDescriptorForType().getFields(), fd -> !seen.contains(fd.getName()) && filter.apply(fd.getName()));
360 356
				for(FieldDescriptor fd : unseen){
361 357
					addFieldValue(metadata, fd, getDefault(fd), expandingRel);
362 358
				}
......
432 428

  
433 429
		if (fd.getType().equals(FieldDescriptor.Type.MESSAGE)) {
434 430

  
431
			if(Author.getDescriptor().equals(fd.getMessageType())) {
432

  
433
				final Author a = (Author) o;
434

  
435
				final StringBuilder sb = new StringBuilder("<creator rank=\"" + a.getRank() + "\"");
436
				if (a.hasName()) {
437
					sb.append(" name=\"" + escapeXml(a.getName()) + "\"");
438
				}
439
				if (a.hasSurname()) {
440
					sb.append(" surname=\"" + escapeXml(a.getSurname()) + "\"");
441
				}
442
				sb.append(">" + escapeXml(a.getFullname()) + "</creator>");
443

  
444
				metadata.add(sb.toString());
445
			}
446

  
435 447
			if (Qualifier.getDescriptor().equals(fd.getMessageType())) {
436 448
				final Qualifier qualifier = (Qualifier) o;
437 449
				metadata.add(asXmlElement(fd.getName(), "", qualifier, null));

Also available in: Unified diff