D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 13 Projects 2 Releases 2 Wiki Activity

removed trick for datasourcetypeui

This commit is contained in:
Michele Artini 2021-07-28 10:23:00 +02:00
parent 848aabbb6c
commit 52e2315ba2
8 changed files with 278 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dhp-workflows/dhp-dedup-openaire/src/main/java/eu/dnetlib/dhp/oa/dedup/GroupEntitiesSparkJob.java
View File

@ -38,8 +38,7 @@ import scala.Tuple2;
/** /**
* Groups the graph content by entity identifier to ensure ID uniqueness * Groups the graph content by entity identifier to ensure ID uniqueness
*/ */
public class public class GroupEntitiesSparkJob {
GroupEntitiesSparkJob {
private static final Logger log = LoggerFactory.getLogger(GroupEntitiesSparkJob.class); private static final Logger log = LoggerFactory.getLogger(GroupEntitiesSparkJob.class);

73
dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/XmlConverterJob.java
View File

@ -22,7 +22,6 @@ import org.apache.spark.util.LongAccumulator;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import eu.dnetlib.dhp.application.ArgumentApplicationParser; import eu.dnetlib.dhp.application.ArgumentApplicationParser;
@ -42,61 +41,51 @@ public class XmlConverterJob {
public static final String schemaLocation = "https://www.openaire.eu/schema/1.0/oaf-1.0.xsd"; public static final String schemaLocation = "https://www.openaire.eu/schema/1.0/oaf-1.0.xsd";
public static void main(String[] args) throws Exception { public static void main(final String[] args) throws Exception {
final ArgumentApplicationParser parser = new ArgumentApplicationParser( final ArgumentApplicationParser parser = new ArgumentApplicationParser(
IOUtils IOUtils
.toString( .toString(
XmlConverterJob.class XmlConverterJob.class
.getResourceAsStream( .getResourceAsStream("/eu/dnetlib/dhp/oa/provision/input_params_xml_converter.json")));
"/eu/dnetlib/dhp/oa/provision/input_params_xml_converter.json")));
parser.parseArgument(args); parser.parseArgument(args);
Boolean isSparkSessionManaged = Optional final Boolean isSparkSessionManaged = Optional
.ofNullable(parser.get("isSparkSessionManaged")) .ofNullable(parser.get("isSparkSessionManaged"))
.map(Boolean::valueOf) .map(Boolean::valueOf)
.orElse(Boolean.TRUE); .orElse(Boolean.TRUE);
log.info("isSparkSessionManaged: {}", isSparkSessionManaged); log.info("isSparkSessionManaged: {}", isSparkSessionManaged);
String inputPath = parser.get("inputPath"); final String inputPath = parser.get("inputPath");
log.info("inputPath: {}", inputPath); log.info("inputPath: {}", inputPath);
String outputPath = parser.get("outputPath"); final String outputPath = parser.get("outputPath");
log.info("outputPath: {}", outputPath); log.info("outputPath: {}", outputPath);
String isLookupUrl = parser.get("isLookupUrl"); final String isLookupUrl = parser.get("isLookupUrl");
log.info("isLookupUrl: {}", isLookupUrl); log.info("isLookupUrl: {}", isLookupUrl);
String otherDsTypeId = parser.get("otherDsTypeId"); final SparkConf conf = new SparkConf();
log.info("otherDsTypeId: {}", otherDsTypeId);
SparkConf conf = new SparkConf();
conf.set("spark.serializer", "org.apache.spark.serializer.KryoSerializer"); conf.set("spark.serializer", "org.apache.spark.serializer.KryoSerializer");
conf.registerKryoClasses(ProvisionModelSupport.getModelClasses()); conf.registerKryoClasses(ProvisionModelSupport.getModelClasses());
runWithSparkSession( runWithSparkSession(conf, isSparkSessionManaged, spark -> {
conf, removeOutputDir(spark, outputPath);
isSparkSessionManaged, convertToXml(spark, inputPath, outputPath, ContextMapper.fromIS(isLookupUrl));
spark -> { });
removeOutputDir(spark, outputPath);
convertToXml(
spark, inputPath, outputPath, ContextMapper.fromIS(isLookupUrl), otherDsTypeId);
});
} }
private static void convertToXml( private static void convertToXml(
SparkSession spark, final SparkSession spark,
String inputPath, final String inputPath,
String outputPath, final String outputPath,
ContextMapper contextMapper, final ContextMapper contextMapper) {
String otherDsTypeId) {
final XmlRecordFactory recordFactory = new XmlRecordFactory( final XmlRecordFactory recordFactory = new XmlRecordFactory(
prepareAccumulators(spark.sparkContext()), prepareAccumulators(spark.sparkContext()),
contextMapper, contextMapper,
false, false,
schemaLocation, schemaLocation);
otherDsTypeId);
final List<String> paths = HdfsSupport final List<String> paths = HdfsSupport
.listFiles(inputPath, spark.sparkContext().hadoopConfiguration()); .listFiles(inputPath, spark.sparkContext().hadoopConfiguration());
@ -116,16 +105,15 @@ public class XmlConverterJob {
.mapToPair( .mapToPair(
(PairFunction<Tuple2<String, String>, Text, Text>) t -> new Tuple2<>(new Text(t._1()), (PairFunction<Tuple2<String, String>, Text, Text>) t -> new Tuple2<>(new Text(t._1()),
new Text(t._2()))) new Text(t._2())))
.saveAsHadoopFile( .saveAsHadoopFile(outputPath, Text.class, Text.class, SequenceFileOutputFormat.class, GzipCodec.class);
outputPath, Text.class, Text.class, SequenceFileOutputFormat.class, GzipCodec.class);
} }
private static void removeOutputDir(SparkSession spark, String path) { private static void removeOutputDir(final SparkSession spark, final String path) {
HdfsSupport.remove(path, spark.sparkContext().hadoopConfiguration()); HdfsSupport.remove(path, spark.sparkContext().hadoopConfiguration());
} }
private static Map<String, LongAccumulator> prepareAccumulators(SparkContext sc) { private static Map<String, LongAccumulator> prepareAccumulators(final SparkContext sc) {
Map<String, LongAccumulator> accumulators = Maps.newHashMap(); final Map<String, LongAccumulator> accumulators = Maps.newHashMap();
accumulators accumulators
.put( .put(
"resultResult_similarity_isAmongTopNSimilarDocuments", "resultResult_similarity_isAmongTopNSimilarDocuments",
@ -136,15 +124,13 @@ public class XmlConverterJob {
sc.longAccumulator("resultResult_similarity_hasAmongTopNSimilarDocuments")); sc.longAccumulator("resultResult_similarity_hasAmongTopNSimilarDocuments"));
accumulators accumulators
.put( .put(
"resultResult_supplement_isSupplementTo", "resultResult_supplement_isSupplementTo", sc.longAccumulator("resultResult_supplement_isSupplementTo"));
sc.longAccumulator("resultResult_supplement_isSupplementTo"));
accumulators accumulators
.put( .put(
"resultResult_supplement_isSupplementedBy", "resultResult_supplement_isSupplementedBy",
sc.longAccumulator("resultResult_supplement_isSupplementedBy")); sc.longAccumulator("resultResult_supplement_isSupplementedBy"));
accumulators accumulators
.put( .put("resultResult_dedup_isMergedIn", sc.longAccumulator("resultResult_dedup_isMergedIn"));
"resultResult_dedup_isMergedIn", sc.longAccumulator("resultResult_dedup_isMergedIn"));
accumulators.put("resultResult_dedup_merges", sc.longAccumulator("resultResult_dedup_merges")); accumulators.put("resultResult_dedup_merges", sc.longAccumulator("resultResult_dedup_merges"));
accumulators accumulators
@ -152,16 +138,11 @@ public class XmlConverterJob {
"resultResult_publicationDataset_isRelatedTo", "resultResult_publicationDataset_isRelatedTo",
sc.longAccumulator("resultResult_publicationDataset_isRelatedTo")); sc.longAccumulator("resultResult_publicationDataset_isRelatedTo"));
accumulators accumulators
.put( .put("resultResult_relationship_isRelatedTo", sc.longAccumulator("resultResult_relationship_isRelatedTo"));
"resultResult_relationship_isRelatedTo",
sc.longAccumulator("resultResult_relationship_isRelatedTo"));
accumulators accumulators
.put( .put("resultProject_outcome_isProducedBy", sc.longAccumulator("resultProject_outcome_isProducedBy"));
"resultProject_outcome_isProducedBy",
sc.longAccumulator("resultProject_outcome_isProducedBy"));
accumulators accumulators
.put( .put("resultProject_outcome_produces", sc.longAccumulator("resultProject_outcome_produces"));
"resultProject_outcome_produces", sc.longAccumulator("resultProject_outcome_produces"));
accumulators accumulators
.put( .put(
"resultOrganization_affiliation_isAuthorInstitutionOf", "resultOrganization_affiliation_isAuthorInstitutionOf",
@ -184,9 +165,7 @@ public class XmlConverterJob {
"organizationOrganization_dedup_isMergedIn", "organizationOrganization_dedup_isMergedIn",
sc.longAccumulator("organizationOrganization_dedup_isMergedIn")); sc.longAccumulator("organizationOrganization_dedup_isMergedIn"));
accumulators accumulators
.put( .put("organizationOrganization_dedup_merges", sc.longAccumulator("resultProject_outcome_produces"));
"organizationOrganization_dedup_merges",
sc.longAccumulator("resultProject_outcome_produces"));
accumulators accumulators
.put( .put(
"datasourceOrganization_provision_isProvidedBy", "datasourceOrganization_provision_isProvidedBy",

447
dhp-workflows/dhp-graph-provision/src/main/java/eu/dnetlib/dhp/oa/provision/utils/XmlRecordFactory.java
View File

@ -1,7 +1,8 @@
package eu.dnetlib.dhp.oa.provision.utils; package eu.dnetlib.dhp.oa.provision.utils;
import static eu.dnetlib.dhp.oa.provision.utils.GraphMappingUtils.*; import static eu.dnetlib.dhp.oa.provision.utils.GraphMappingUtils.authorPidTypes;
import static eu.dnetlib.dhp.oa.provision.utils.GraphMappingUtils.getRelDescriptor;
import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.commons.lang3.StringUtils.substringBefore; import static org.apache.commons.lang3.StringUtils.substringBefore;
@ -9,14 +10,23 @@ import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.io.StringReader; import java.io.StringReader;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.*; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.xml.transform.*; import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource; import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamResult;
import eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.spark.util.LongAccumulator; import org.apache.spark.util.LongAccumulator;
import org.dom4j.Document; import org.dom4j.Document;
@ -36,19 +46,38 @@ import com.google.common.collect.Sets;
import com.mycila.xmltool.XMLDoc; import com.mycila.xmltool.XMLDoc;
import com.mycila.xmltool.XMLTag; import com.mycila.xmltool.XMLTag;
import eu.dnetlib.dhp.oa.provision.model.*; import eu.dnetlib.dhp.oa.provision.model.JoinedEntity;
import eu.dnetlib.dhp.oa.provision.model.RelatedEntity;
import eu.dnetlib.dhp.oa.provision.model.RelatedEntityWrapper;
import eu.dnetlib.dhp.schema.common.EntityType; import eu.dnetlib.dhp.schema.common.EntityType;
import eu.dnetlib.dhp.schema.common.MainEntityType; import eu.dnetlib.dhp.schema.common.MainEntityType;
import eu.dnetlib.dhp.schema.common.ModelConstants; import eu.dnetlib.dhp.schema.common.ModelConstants;
import eu.dnetlib.dhp.schema.common.ModelSupport; import eu.dnetlib.dhp.schema.common.ModelSupport;
import eu.dnetlib.dhp.schema.oaf.*; import eu.dnetlib.dhp.schema.oaf.Dataset;
import eu.dnetlib.dhp.schema.oaf.Datasource;
import eu.dnetlib.dhp.schema.oaf.ExternalReference;
import eu.dnetlib.dhp.schema.oaf.ExtraInfo;
import eu.dnetlib.dhp.schema.oaf.Instance;
import eu.dnetlib.dhp.schema.oaf.Journal;
import eu.dnetlib.dhp.schema.oaf.KeyValue;
import eu.dnetlib.dhp.schema.oaf.OafEntity;
import eu.dnetlib.dhp.schema.oaf.Organization;
import eu.dnetlib.dhp.schema.oaf.OtherResearchProduct;
import eu.dnetlib.dhp.schema.oaf.Project;
import eu.dnetlib.dhp.schema.oaf.Publication;
import eu.dnetlib.dhp.schema.oaf.Relation;
import eu.dnetlib.dhp.schema.oaf.Result; import eu.dnetlib.dhp.schema.oaf.Result;
import eu.dnetlib.dhp.schema.oaf.Software;
import eu.dnetlib.dhp.schema.oaf.utils.IdentifierFactory;
public class XmlRecordFactory implements Serializable { public class XmlRecordFactory implements Serializable {
private final Map<String, LongAccumulator> accumulators; /**
*
*/
private static final long serialVersionUID = 2912912999272373172L;
private final Set<String> specialDatasourceTypes; private final Map<String, LongAccumulator> accumulators;
private final ContextMapper contextMapper; private final ContextMapper contextMapper;
@ -61,23 +90,20 @@ public class XmlRecordFactory implements Serializable {
public XmlRecordFactory( public XmlRecordFactory(
final ContextMapper contextMapper, final ContextMapper contextMapper,
final boolean indent, final boolean indent,
final String schemaLocation, final String schemaLocation) {
final String otherDatasourceTypesUForUI) {
this(Maps.newHashMap(), contextMapper, indent, schemaLocation, otherDatasourceTypesUForUI); this(Maps.newHashMap(), contextMapper, indent, schemaLocation);
} }
public XmlRecordFactory( public XmlRecordFactory(
final Map<String, LongAccumulator> accumulators, final Map<String, LongAccumulator> accumulators,
final ContextMapper contextMapper, final ContextMapper contextMapper,
final boolean indent, final boolean indent,
final String schemaLocation, final String schemaLocation) {
final String otherDatasourceTypesUForUI) {
this.accumulators = accumulators; this.accumulators = accumulators;
this.contextMapper = contextMapper; this.contextMapper = contextMapper;
this.schemaLocation = schemaLocation; this.schemaLocation = schemaLocation;
this.specialDatasourceTypes = Sets.newHashSet(Splitter.on(",").trimResults().split(otherDatasourceTypesUForUI));
this.indent = indent; this.indent = indent;
} }
@ -87,8 +113,8 @@ public class XmlRecordFactory implements Serializable {
final Set<String> contexts = Sets.newHashSet(); final Set<String> contexts = Sets.newHashSet();
// final OafEntity entity = toOafEntity(je.getEntity()); // final OafEntity entity = toOafEntity(je.getEntity());
OafEntity entity = je.getEntity(); final OafEntity entity = je.getEntity();
TemplateFactory templateFactory = new TemplateFactory(); final TemplateFactory templateFactory = new TemplateFactory();
try { try {
final EntityType type = EntityType.fromClass(entity.getClass()); final EntityType type = EntityType.fromClass(entity.getClass());
@ -110,11 +136,7 @@ public class XmlRecordFactory implements Serializable {
final String body = templateFactory final String body = templateFactory
.buildBody( .buildBody(
mainType, mainType, metadata, relations, listChildren(entity, je, templateFactory), listExtraInfo(entity));
metadata,
relations,
listChildren(entity, je, templateFactory),
listExtraInfo(entity));
return printXML(templateFactory.buildRecord(entity, schemaLocation, body), indent); return printXML(templateFactory.buildRecord(entity, schemaLocation, body), indent);
} catch (final Throwable e) { } catch (final Throwable e) {
@ -142,19 +164,19 @@ public class XmlRecordFactory implements Serializable {
default: default:
throw new IllegalArgumentException("invalid type: " + type); throw new IllegalArgumentException("invalid type: " + type);
} }
} catch (IOException e) { } catch (final IOException e) {
throw new IllegalArgumentException(e); throw new IllegalArgumentException(e);
} }
} }
private String printXML(String xml, boolean indent) { private String printXML(final String xml, final boolean indent) {
try { try {
final Document doc = new SAXReader().read(new StringReader(xml)); final Document doc = new SAXReader().read(new StringReader(xml));
OutputFormat format = indent ? OutputFormat.createPrettyPrint() : OutputFormat.createCompactFormat(); final OutputFormat format = indent ? OutputFormat.createPrettyPrint() : OutputFormat.createCompactFormat();
format.setExpandEmptyElements(false); format.setExpandEmptyElements(false);
format.setSuppressDeclaration(true); format.setSuppressDeclaration(true);
StringWriter sw = new StringWriter(); final StringWriter sw = new StringWriter();
XMLWriter writer = new XMLWriter(sw, format); final XMLWriter writer = new XMLWriter(sw, format);
writer.write(doc); writer.write(doc);
return sw.toString(); return sw.toString();
} catch (IOException | DocumentException e) { } catch (IOException | DocumentException e) {
@ -163,7 +185,9 @@ public class XmlRecordFactory implements Serializable {
} }
private List<String> metadata( private List<String> metadata(
final EntityType type, final OafEntity entity, final Set<String> contexts) { final EntityType type,
final OafEntity entity,
final Set<String> contexts) {
final List<String> metadata = Lists.newArrayList(); final List<String> metadata = Lists.newArrayList();
@ -230,72 +254,63 @@ public class XmlRecordFactory implements Serializable {
.getAuthor() .getAuthor()
.stream() .stream()
.filter(Objects::nonNull) .filter(Objects::nonNull)
.map( .map(a -> {
a -> { final StringBuilder sb = new StringBuilder("<creator rank=\"" + a.getRank() + "\"");
final StringBuilder sb = new StringBuilder("<creator rank=\"" + a.getRank() + "\""); if (isNotBlank(a.getName())) {
if (isNotBlank(a.getName())) { sb.append(" name=\"" + XmlSerializationUtils.escapeXml(a.getName()) + "\"");
sb.append(" name=\"" + XmlSerializationUtils.escapeXml(a.getName()) + "\""); }
} if (isNotBlank(a.getSurname())) {
if (isNotBlank(a.getSurname())) {
sb
.append(
" surname=\"" + XmlSerializationUtils.escapeXml(a.getSurname()) + "\"");
}
if (a.getPid() != null) {
a
.getPid()
.stream()
.filter(Objects::nonNull)
.filter(
sp -> isNotBlank(sp.getQualifier().getClassid())
&& isNotBlank(sp.getValue()))
.collect(
Collectors
.toMap(
p -> getAuthorPidType(p.getQualifier().getClassid()),
p -> p,
(p1, p2) -> p1))
.values()
.stream()
.collect(
Collectors
.groupingBy(
p -> p.getValue(),
Collectors
.mapping(
p -> p,
Collectors.minBy(new AuthorPidTypeComparator()))))
.values()
.stream()
.map(op -> op.get())
.forEach(
sp -> {
String pidType = getAuthorPidType(sp.getQualifier().getClassid());
String pidValue = XmlSerializationUtils.escapeXml(sp.getValue());
// ugly hack: some records provide swapped pidtype and pidvalue
if (authorPidTypes.contains(pidValue.toLowerCase().trim())) {
sb.append(String.format(" %s=\"%s\"", pidValue, pidType));
} else {
if (isNotBlank(pidType)) {
sb
.append(
String
.format(
" %s=\"%s\"",
pidType,
pidValue
.toLowerCase()
.replaceAll("^.*orcid\\.org\\/", "")));
}
}
});
}
sb sb
.append( .append(" surname=\"" + XmlSerializationUtils.escapeXml(a.getSurname()) + "\"");
">" + XmlSerializationUtils.escapeXml(a.getFullname()) + "</creator>"); }
return sb.toString(); if (a.getPid() != null) {
}) a
.getPid()
.stream()
.filter(Objects::nonNull)
.filter(
sp -> isNotBlank(sp.getQualifier().getClassid())
&& isNotBlank(sp.getValue()))
.collect(
Collectors
.toMap(
p -> getAuthorPidType(p.getQualifier().getClassid()), p -> p,
(p1, p2) -> p1))
.values()
.stream()
.collect(
Collectors
.groupingBy(
p -> p.getValue(), Collectors
.mapping(
p -> p, Collectors.minBy(new AuthorPidTypeComparator()))))
.values()
.stream()
.map(op -> op.get())
.forEach(sp -> {
final String pidType = getAuthorPidType(sp.getQualifier().getClassid());
final String pidValue = XmlSerializationUtils.escapeXml(sp.getValue());
// ugly hack: some records provide swapped pidtype and pidvalue
if (authorPidTypes.contains(pidValue.toLowerCase().trim())) {
sb.append(String.format(" %s=\"%s\"", pidValue, pidType));
} else {
if (isNotBlank(pidType)) {
sb
.append(
String
.format(
" %s=\"%s\"", pidType, pidValue
.toLowerCase()
.replaceAll("^.*orcid\\.org\\/", "")));
}
}
});
}
sb
.append(">" + XmlSerializationUtils.escapeXml(a.getFullname()) + "</creator>");
return sb.toString();
})
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
if (r.getContributor() != null) { if (r.getContributor() != null) {
@ -332,8 +347,7 @@ public class XmlRecordFactory implements Serializable {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("dateofacceptance", r.getDateofacceptance().getValue()));
"dateofacceptance", r.getDateofacceptance().getValue()));
} }
if (r.getDescription() != null) { if (r.getDescription() != null) {
metadata metadata
@ -347,8 +361,7 @@ public class XmlRecordFactory implements Serializable {
} }
if (r.getEmbargoenddate() != null) { if (r.getEmbargoenddate() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("embargoenddate", r.getEmbargoenddate().getValue()));
XmlSerializationUtils.asXmlElement("embargoenddate", r.getEmbargoenddate().getValue()));
} }
if (r.getSubject() != null) { if (r.getSubject() != null) {
metadata metadata
@ -423,23 +436,20 @@ public class XmlRecordFactory implements Serializable {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("lastmetadataupdate", d.getLastmetadataupdate().getValue()));
"lastmetadataupdate", d.getLastmetadataupdate().getValue()));
} }
if (d.getMetadataversionnumber() != null) { if (d.getMetadataversionnumber() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("metadataversionnumber", d.getMetadataversionnumber().getValue()));
"metadataversionnumber", d.getMetadataversionnumber().getValue()));
} }
if (d.getSize() != null) { if (d.getSize() != null) {
metadata.add(XmlSerializationUtils.asXmlElement("size", d.getSize().getValue())); metadata.add(XmlSerializationUtils.asXmlElement("size", d.getSize().getValue()));
} }
if (d.getStoragedate() != null) { if (d.getStoragedate() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("storagedate", d.getStoragedate().getValue()));
XmlSerializationUtils.asXmlElement("storagedate", d.getStoragedate().getValue()));
} }
if (d.getVersion() != null) { if (d.getVersion() != null) {
metadata.add(XmlSerializationUtils.asXmlElement("version", d.getVersion().getValue())); metadata.add(XmlSerializationUtils.asXmlElement("version", d.getVersion().getValue()));
@ -509,98 +519,87 @@ public class XmlRecordFactory implements Serializable {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("codeRepositoryUrl", s.getCodeRepositoryUrl().getValue()));
"codeRepositoryUrl", s.getCodeRepositoryUrl().getValue()));
} }
if (s.getProgrammingLanguage() != null) { if (s.getProgrammingLanguage() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.mapQualifier( .mapQualifier("programmingLanguage", s.getProgrammingLanguage()));
"programmingLanguage", s.getProgrammingLanguage()));
} }
break; break;
case datasource: case datasource:
final Datasource ds = (Datasource) entity; final Datasource ds = (Datasource) entity;
if (ds.getDatasourcetype() != null) { if (ds.getDatasourcetype() != null) {
mapDatasourceType(metadata, ds.getDatasourcetype()); metadata.add(XmlSerializationUtils.mapQualifier("datasourcetype", ds.getDatasourcetype()));
}
if (ds.getDatasourcetypeui() != null) {
metadata.add(XmlSerializationUtils.mapQualifier("datasourcetypeui", ds.getDatasourcetypeui()));
} }
if (ds.getOpenairecompatibility() != null) { if (ds.getOpenairecompatibility() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.mapQualifier( .mapQualifier("openairecompatibility", ds.getOpenairecompatibility()));
"openairecompatibility", ds.getOpenairecompatibility()));
} }
if (ds.getOfficialname() != null) { if (ds.getOfficialname() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("officialname", ds.getOfficialname().getValue()));
XmlSerializationUtils.asXmlElement("officialname", ds.getOfficialname().getValue()));
} }
if (ds.getEnglishname() != null) { if (ds.getEnglishname() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("englishname", ds.getEnglishname().getValue()));
XmlSerializationUtils.asXmlElement("englishname", ds.getEnglishname().getValue()));
} }
if (ds.getWebsiteurl() != null) { if (ds.getWebsiteurl() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("websiteurl", ds.getWebsiteurl().getValue()));
XmlSerializationUtils.asXmlElement("websiteurl", ds.getWebsiteurl().getValue()));
} }
if (ds.getLogourl() != null) { if (ds.getLogourl() != null) {
metadata.add(XmlSerializationUtils.asXmlElement("logourl", ds.getLogourl().getValue())); metadata.add(XmlSerializationUtils.asXmlElement("logourl", ds.getLogourl().getValue()));
} }
if (ds.getContactemail() != null) { if (ds.getContactemail() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("contactemail", ds.getContactemail().getValue()));
XmlSerializationUtils.asXmlElement("contactemail", ds.getContactemail().getValue()));
} }
if (ds.getNamespaceprefix() != null) { if (ds.getNamespaceprefix() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("namespaceprefix", ds.getNamespaceprefix().getValue()));
"namespaceprefix", ds.getNamespaceprefix().getValue()));
} }
if (ds.getLatitude() != null) { if (ds.getLatitude() != null) {
metadata.add(XmlSerializationUtils.asXmlElement("latitude", ds.getLatitude().getValue())); metadata.add(XmlSerializationUtils.asXmlElement("latitude", ds.getLatitude().getValue()));
} }
if (ds.getLongitude() != null) { if (ds.getLongitude() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("longitude", ds.getLongitude().getValue()));
XmlSerializationUtils.asXmlElement("longitude", ds.getLongitude().getValue()));
} }
if (ds.getDateofvalidation() != null) { if (ds.getDateofvalidation() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("dateofvalidation", ds.getDateofvalidation().getValue()));
"dateofvalidation", ds.getDateofvalidation().getValue()));
} }
if (ds.getDescription() != null) { if (ds.getDescription() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("description", ds.getDescription().getValue()));
XmlSerializationUtils.asXmlElement("description", ds.getDescription().getValue()));
} }
if (ds.getOdnumberofitems() != null) { if (ds.getOdnumberofitems() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("odnumberofitems", ds.getOdnumberofitems().getValue()));
"odnumberofitems", ds.getOdnumberofitems().getValue()));
} }
if (ds.getOdnumberofitemsdate() != null) { if (ds.getOdnumberofitemsdate() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("odnumberofitemsdate", ds.getOdnumberofitemsdate().getValue()));
"odnumberofitemsdate", ds.getOdnumberofitemsdate().getValue()));
} }
if (ds.getOdpolicies() != null) { if (ds.getOdpolicies() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("odpolicies", ds.getOdpolicies().getValue()));
XmlSerializationUtils.asXmlElement("odpolicies", ds.getOdpolicies().getValue()));
} }
if (ds.getOdlanguages() != null) { if (ds.getOdlanguages() != null) {
metadata metadata
@ -635,50 +634,43 @@ public class XmlRecordFactory implements Serializable {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("releasestartdate", ds.getReleaseenddate().getValue()));
"releasestartdate", ds.getReleaseenddate().getValue()));
} }
if (ds.getReleaseenddate() != null) { if (ds.getReleaseenddate() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("releaseenddate", ds.getReleaseenddate().getValue()));
"releaseenddate", ds.getReleaseenddate().getValue()));
} }
if (ds.getMissionstatementurl() != null) { if (ds.getMissionstatementurl() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("missionstatementurl", ds.getMissionstatementurl().getValue()));
"missionstatementurl", ds.getMissionstatementurl().getValue()));
} }
if (ds.getDataprovider() != null) { if (ds.getDataprovider() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("dataprovider", ds.getDataprovider().getValue().toString()));
"dataprovider", ds.getDataprovider().getValue().toString()));
} }
if (ds.getServiceprovider() != null) { if (ds.getServiceprovider() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("serviceprovider", ds.getServiceprovider().getValue().toString()));
"serviceprovider", ds.getServiceprovider().getValue().toString()));
} }
if (ds.getDatabaseaccesstype() != null) { if (ds.getDatabaseaccesstype() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("databaseaccesstype", ds.getDatabaseaccesstype().getValue()));
"databaseaccesstype", ds.getDatabaseaccesstype().getValue()));
} }
if (ds.getDatauploadtype() != null) { if (ds.getDatauploadtype() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("datauploadtype", ds.getDatauploadtype().getValue()));
"datauploadtype", ds.getDatauploadtype().getValue()));
} }
if (ds.getDatabaseaccessrestriction() != null) { if (ds.getDatabaseaccessrestriction() != null) {
metadata metadata
@ -691,39 +683,33 @@ public class XmlRecordFactory implements Serializable {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("datauploadrestriction", ds.getDatauploadrestriction().getValue()));
"datauploadrestriction", ds.getDatauploadrestriction().getValue()));
} }
if (ds.getVersioning() != null) { if (ds.getVersioning() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("versioning", ds.getVersioning().getValue().toString()));
"versioning", ds.getVersioning().getValue().toString()));
} }
if (ds.getCitationguidelineurl() != null) { if (ds.getCitationguidelineurl() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("citationguidelineurl", ds.getCitationguidelineurl().getValue()));
"citationguidelineurl", ds.getCitationguidelineurl().getValue()));
} }
if (ds.getQualitymanagementkind() != null) { if (ds.getQualitymanagementkind() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("qualitymanagementkind", ds.getQualitymanagementkind().getValue()));
"qualitymanagementkind", ds.getQualitymanagementkind().getValue()));
} }
if (ds.getPidsystems() != null) { if (ds.getPidsystems() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("pidsystems", ds.getPidsystems().getValue()));
XmlSerializationUtils.asXmlElement("pidsystems", ds.getPidsystems().getValue()));
} }
if (ds.getCertificates() != null) { if (ds.getCertificates() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("certificates", ds.getCertificates().getValue()));
XmlSerializationUtils.asXmlElement("certificates", ds.getCertificates().getValue()));
} }
if (ds.getPolicies() != null) { if (ds.getPolicies() != null) {
metadata metadata
@ -757,13 +743,11 @@ public class XmlRecordFactory implements Serializable {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("legalshortname", o.getLegalshortname().getValue()));
"legalshortname", o.getLegalshortname().getValue()));
} }
if (o.getLegalname() != null) { if (o.getLegalname() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("legalname", o.getLegalname().getValue()));
XmlSerializationUtils.asXmlElement("legalname", o.getLegalname().getValue()));
} }
if (o.getAlternativeNames() != null) { if (o.getAlternativeNames() != null) {
metadata metadata
@ -777,8 +761,7 @@ public class XmlRecordFactory implements Serializable {
} }
if (o.getWebsiteurl() != null) { if (o.getWebsiteurl() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("websiteurl", o.getWebsiteurl().getValue()));
XmlSerializationUtils.asXmlElement("websiteurl", o.getWebsiteurl().getValue()));
} }
if (o.getLogourl() != null) { if (o.getLogourl() != null) {
metadata.add(XmlSerializationUtils.asXmlElement("logourl", o.getLogourl().getValue())); metadata.add(XmlSerializationUtils.asXmlElement("logourl", o.getLogourl().getValue()));
@ -786,32 +769,27 @@ public class XmlRecordFactory implements Serializable {
if (o.getEclegalbody() != null) { if (o.getEclegalbody() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("eclegalbody", o.getEclegalbody().getValue()));
XmlSerializationUtils.asXmlElement("eclegalbody", o.getEclegalbody().getValue()));
} }
if (o.getEclegalperson() != null) { if (o.getEclegalperson() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("eclegalperson", o.getEclegalperson().getValue()));
XmlSerializationUtils.asXmlElement("eclegalperson", o.getEclegalperson().getValue()));
} }
if (o.getEcnonprofit() != null) { if (o.getEcnonprofit() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("ecnonprofit", o.getEcnonprofit().getValue()));
XmlSerializationUtils.asXmlElement("ecnonprofit", o.getEcnonprofit().getValue()));
} }
if (o.getEcresearchorganization() != null) { if (o.getEcresearchorganization() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("ecresearchorganization", o.getEcresearchorganization().getValue()));
"ecresearchorganization", o.getEcresearchorganization().getValue()));
} }
if (o.getEchighereducation() != null) { if (o.getEchighereducation() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("echighereducation", o.getEchighereducation().getValue()));
"echighereducation", o.getEchighereducation().getValue()));
} }
if (o.getEcinternationalorganizationeurinterests() != null) { if (o.getEcinternationalorganizationeurinterests() != null) {
metadata metadata
@ -830,20 +808,17 @@ public class XmlRecordFactory implements Serializable {
} }
if (o.getEcenterprise() != null) { if (o.getEcenterprise() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("ecenterprise", o.getEcenterprise().getValue()));
XmlSerializationUtils.asXmlElement("ecenterprise", o.getEcenterprise().getValue()));
} }
if (o.getEcsmevalidated() != null) { if (o.getEcsmevalidated() != null) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("ecsmevalidated", o.getEcsmevalidated().getValue()));
"ecsmevalidated", o.getEcsmevalidated().getValue()));
} }
if (o.getEcnutscode() != null) { if (o.getEcnutscode() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("ecnutscode", o.getEcnutscode().getValue()));
XmlSerializationUtils.asXmlElement("ecnutscode", o.getEcnutscode().getValue()));
} }
if (o.getCountry() != null) { if (o.getCountry() != null) {
metadata.add(XmlSerializationUtils.mapQualifier("country", o.getCountry())); metadata.add(XmlSerializationUtils.mapQualifier("country", o.getCountry()));
@ -855,8 +830,7 @@ public class XmlRecordFactory implements Serializable {
if (p.getWebsiteurl() != null) { if (p.getWebsiteurl() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("websiteurl", p.getWebsiteurl().getValue()));
XmlSerializationUtils.asXmlElement("websiteurl", p.getWebsiteurl().getValue()));
} }
if (p.getCode() != null) { if (p.getCode() != null) {
metadata.add(XmlSerializationUtils.asXmlElement("code", p.getCode().getValue())); metadata.add(XmlSerializationUtils.asXmlElement("code", p.getCode().getValue()));
@ -869,8 +843,7 @@ public class XmlRecordFactory implements Serializable {
} }
if (p.getStartdate() != null) { if (p.getStartdate() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("startdate", p.getStartdate().getValue()));
XmlSerializationUtils.asXmlElement("startdate", p.getStartdate().getValue()));
} }
if (p.getEnddate() != null) { if (p.getEnddate() != null) {
metadata.add(XmlSerializationUtils.asXmlElement("enddate", p.getEnddate().getValue())); metadata.add(XmlSerializationUtils.asXmlElement("enddate", p.getEnddate().getValue()));
@ -879,8 +852,7 @@ public class XmlRecordFactory implements Serializable {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("callidentifier", p.getCallidentifier().getValue()));
"callidentifier", p.getCallidentifier().getValue()));
} }
if (p.getKeywords() != null) { if (p.getKeywords() != null) {
metadata.add(XmlSerializationUtils.asXmlElement("keywords", p.getKeywords().getValue())); metadata.add(XmlSerializationUtils.asXmlElement("keywords", p.getKeywords().getValue()));
@ -890,8 +862,7 @@ public class XmlRecordFactory implements Serializable {
} }
if (p.getEcarticle29_3() != null) { if (p.getEcarticle29_3() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("ecarticle29_3", p.getEcarticle29_3().getValue()));
XmlSerializationUtils.asXmlElement("ecarticle29_3", p.getEcarticle29_3().getValue()));
} }
if (p.getSubjects() != null) { if (p.getSubjects() != null) {
metadata metadata
@ -923,13 +894,11 @@ public class XmlRecordFactory implements Serializable {
} }
if (p.getTotalcost() != null) { if (p.getTotalcost() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("totalcost", p.getTotalcost().toString()));
XmlSerializationUtils.asXmlElement("totalcost", p.getTotalcost().toString()));
} }
if (p.getFundedamount() != null) { if (p.getFundedamount() != null) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("fundedamount", p.getFundedamount().toString()));
XmlSerializationUtils.asXmlElement("fundedamount", p.getFundedamount().toString()));
} }
if (p.getFundingtree() != null) { if (p.getFundingtree() != null) {
metadata metadata
@ -950,28 +919,18 @@ public class XmlRecordFactory implements Serializable {
return metadata; return metadata;
} }
private String getAuthorPidType(String s) { private String getAuthorPidType(final String s) {
return XmlSerializationUtils return XmlSerializationUtils
.escapeXml(s) .escapeXml(s)
.replaceAll("\\W", "") .replaceAll("\\W", "")
.replaceAll("\\d", ""); .replaceAll("\\d", "");
} }
private static boolean kvNotBlank(KeyValue kv) { private static boolean kvNotBlank(final KeyValue kv) {
return kv != null && StringUtils.isNotBlank(kv.getKey()) && StringUtils.isNotBlank(kv.getValue()); return kv != null && StringUtils.isNotBlank(kv.getKey()) && StringUtils.isNotBlank(kv.getValue());
} }
private void mapDatasourceType(List<String> metadata, final Qualifier dsType) { private List<String> mapFields(final RelatedEntityWrapper link, final Set<String> contexts) {
metadata.add(XmlSerializationUtils.mapQualifier("datasourcetype", dsType));
if (specialDatasourceTypes.contains(dsType.getClassid())) {
dsType.setClassid("other");
dsType.setClassname("other");
}
metadata.add(XmlSerializationUtils.mapQualifier("datasourcetypeui", dsType));
}
private List<String> mapFields(RelatedEntityWrapper link, Set<String> contexts) {
final Relation rel = link.getRelation(); final Relation rel = link.getRelation();
final RelatedEntity re = link.getTarget(); final RelatedEntity re = link.getTarget();
final String targetType = link.getTarget().getType(); final String targetType = link.getTarget().getType();
@ -987,16 +946,14 @@ public class XmlRecordFactory implements Serializable {
} }
if (isNotBlank(re.getDateofacceptance())) { if (isNotBlank(re.getDateofacceptance())) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("dateofacceptance", re.getDateofacceptance()));
XmlSerializationUtils.asXmlElement("dateofacceptance", re.getDateofacceptance()));
} }
if (isNotBlank(re.getPublisher())) { if (isNotBlank(re.getPublisher())) {
metadata.add(XmlSerializationUtils.asXmlElement("publisher", re.getPublisher())); metadata.add(XmlSerializationUtils.asXmlElement("publisher", re.getPublisher()));
} }
if (isNotBlank(re.getCodeRepositoryUrl())) { if (isNotBlank(re.getCodeRepositoryUrl())) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("coderepositoryurl", re.getCodeRepositoryUrl()));
XmlSerializationUtils.asXmlElement("coderepositoryurl", re.getCodeRepositoryUrl()));
} }
if (re.getResulttype() != null && re.getResulttype().isBlank()) { if (re.getResulttype() != null && re.getResulttype().isBlank()) {
metadata.add(XmlSerializationUtils.mapQualifier("resulttype", re.getResulttype())); metadata.add(XmlSerializationUtils.mapQualifier("resulttype", re.getResulttype()));
@ -1026,14 +983,16 @@ public class XmlRecordFactory implements Serializable {
metadata.add(XmlSerializationUtils.asXmlElement("officialname", re.getOfficialname())); metadata.add(XmlSerializationUtils.asXmlElement("officialname", re.getOfficialname()));
} }
if (re.getDatasourcetype() != null && !re.getDatasourcetype().isBlank()) { if (re.getDatasourcetype() != null && !re.getDatasourcetype().isBlank()) {
mapDatasourceType(metadata, re.getDatasourcetype()); metadata.add(XmlSerializationUtils.mapQualifier("datasourcetype", re.getDatasourcetype()));
}
if (re.getDatasourcetypeui() != null && !re.getDatasourcetypeui().isBlank()) {
metadata.add(XmlSerializationUtils.mapQualifier("datasourcetypeui", re.getDatasourcetypeui()));
} }
if (re.getOpenairecompatibility() != null && !re.getOpenairecompatibility().isBlank()) { if (re.getOpenairecompatibility() != null && !re.getOpenairecompatibility().isBlank()) {
metadata metadata
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.mapQualifier( .mapQualifier("openairecompatibility", re.getOpenairecompatibility()));
"openairecompatibility", re.getOpenairecompatibility()));
} }
break; break;
case organization: case organization:
@ -1042,8 +1001,7 @@ public class XmlRecordFactory implements Serializable {
} }
if (isNotBlank(re.getLegalshortname())) { if (isNotBlank(re.getLegalshortname())) {
metadata metadata
.add( .add(XmlSerializationUtils.asXmlElement("legalshortname", re.getLegalshortname()));
XmlSerializationUtils.asXmlElement("legalshortname", re.getLegalshortname()));
} }
if (re.getCountry() != null && !re.getCountry().isBlank()) { if (re.getCountry() != null && !re.getCountry().isBlank()) {
metadata.add(XmlSerializationUtils.mapQualifier("country", re.getCountry())); metadata.add(XmlSerializationUtils.mapQualifier("country", re.getCountry()));
@ -1085,8 +1043,10 @@ public class XmlRecordFactory implements Serializable {
return metadata; return metadata;
} }
private String mapRelation(Set<String> contexts, TemplateFactory templateFactory, EntityType type, private String mapRelation(final Set<String> contexts,
RelatedEntityWrapper link) { final TemplateFactory templateFactory,
final EntityType type,
final RelatedEntityWrapper link) {
final Relation rel = link.getRelation(); final Relation rel = link.getRelation();
final String targetType = link.getTarget().getType(); final String targetType = link.getTarget().getType();
final String scheme = ModelSupport.getScheme(type.toString(), targetType); final String scheme = ModelSupport.getScheme(type.toString(), targetType);
@ -1096,8 +1056,9 @@ public class XmlRecordFactory implements Serializable {
String.format("missing scheme for: <%s - %s>", type, targetType)); String.format("missing scheme for: <%s - %s>", type, targetType));
} }
final HashSet<String> fields = Sets.newHashSet(mapFields(link, contexts)); final HashSet<String> fields = Sets.newHashSet(mapFields(link, contexts));
if (rel.getValidated() == null) if (rel.getValidated() == null) {
rel.setValidated(false); rel.setValidated(false);
}
return templateFactory return templateFactory
.getRel( .getRel(
targetType, rel.getTarget(), fields, rel.getRelClass(), scheme, rel.getDataInfo(), rel.getValidated(), targetType, rel.getTarget(), fields, rel.getRelClass(), scheme, rel.getDataInfo(), rel.getValidated(),
@ -1105,12 +1066,14 @@ public class XmlRecordFactory implements Serializable {
} }
private List<String> listChildren( private List<String> listChildren(
final OafEntity entity, JoinedEntity je, TemplateFactory templateFactory) { final OafEntity entity,
final JoinedEntity je,
final TemplateFactory templateFactory) {
final EntityType entityType = EntityType.fromClass(je.getEntity().getClass()); final EntityType entityType = EntityType.fromClass(je.getEntity().getClass());
final List<RelatedEntityWrapper> links = je.getLinks(); final List<RelatedEntityWrapper> links = je.getLinks();
List<String> children = links final List<String> children = links
.stream() .stream()
.filter(link -> isDuplicate(link)) .filter(link -> isDuplicate(link))
.map(link -> { .map(link -> {
@ -1131,13 +1094,11 @@ public class XmlRecordFactory implements Serializable {
if (instance.getAccessright() != null && !instance.getAccessright().isBlank()) { if (instance.getAccessright() != null && !instance.getAccessright().isBlank()) {
fields fields
.add( .add(XmlSerializationUtils.mapQualifier("accessright", instance.getAccessright()));
XmlSerializationUtils.mapQualifier("accessright", instance.getAccessright()));
} }
if (instance.getCollectedfrom() != null && kvNotBlank(instance.getCollectedfrom())) { if (instance.getCollectedfrom() != null && kvNotBlank(instance.getCollectedfrom())) {
fields fields
.add( .add(XmlSerializationUtils.mapKeyValue("collectedfrom", instance.getCollectedfrom()));
XmlSerializationUtils.mapKeyValue("collectedfrom", instance.getCollectedfrom()));
} }
if (instance.getHostedby() != null && kvNotBlank(instance.getHostedby())) { if (instance.getHostedby() != null && kvNotBlank(instance.getHostedby())) {
fields.add(XmlSerializationUtils.mapKeyValue("hostedby", instance.getHostedby())); fields.add(XmlSerializationUtils.mapKeyValue("hostedby", instance.getHostedby()));
@ -1147,20 +1108,17 @@ public class XmlRecordFactory implements Serializable {
fields fields
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("dateofacceptance", instance.getDateofacceptance().getValue()));
"dateofacceptance", instance.getDateofacceptance().getValue()));
} }
if (instance.getInstancetype() != null && !instance.getInstancetype().isBlank()) { if (instance.getInstancetype() != null && !instance.getInstancetype().isBlank()) {
fields fields
.add( .add(XmlSerializationUtils.mapQualifier("instancetype", instance.getInstancetype()));
XmlSerializationUtils.mapQualifier("instancetype", instance.getInstancetype()));
} }
if (isNotBlank(instance.getDistributionlocation())) { if (isNotBlank(instance.getDistributionlocation())) {
fields fields
.add( .add(
XmlSerializationUtils XmlSerializationUtils
.asXmlElement( .asXmlElement("distributionlocation", instance.getDistributionlocation()));
"distributionlocation", instance.getDistributionlocation()));
} }
if (instance.getPid() != null) { if (instance.getPid() != null) {
fields fields
@ -1185,8 +1143,7 @@ public class XmlRecordFactory implements Serializable {
if (instance.getRefereed() != null && !instance.getRefereed().isBlank()) { if (instance.getRefereed() != null && !instance.getRefereed().isBlank()) {
fields fields
.add( .add(XmlSerializationUtils.mapQualifier("refereed", instance.getRefereed()));
XmlSerializationUtils.mapQualifier("refereed", instance.getRefereed()));
} }
if (instance.getProcessingchargeamount() != null if (instance.getProcessingchargeamount() != null
&& isNotBlank(instance.getProcessingchargeamount().getValue())) { && isNotBlank(instance.getProcessingchargeamount().getValue())) {
@ -1208,8 +1165,7 @@ public class XmlRecordFactory implements Serializable {
children children
.add( .add(
templateFactory templateFactory
.getInstance( .getInstance(instance.getHostedby().getKey(), fields, instance.getUrl()));
instance.getHostedby().getKey(), fields, instance.getUrl()));
} }
} }
final List<ExternalReference> ext = ((Result) entity).getExternalReference(); final List<ExternalReference> ext = ((Result) entity).getExternalReference();
@ -1254,11 +1210,11 @@ public class XmlRecordFactory implements Serializable {
return children; return children;
} }
private boolean isDuplicate(RelatedEntityWrapper link) { private boolean isDuplicate(final RelatedEntityWrapper link) {
return ModelConstants.DEDUP.equalsIgnoreCase(link.getRelation().getSubRelType()); return ModelConstants.DEDUP.equalsIgnoreCase(link.getRelation().getSubRelType());
} }
private List<String> listExtraInfo(OafEntity entity) { private List<String> listExtraInfo(final OafEntity entity) {
final List<ExtraInfo> extraInfo = entity.getExtraInfo(); final List<ExtraInfo> extraInfo = entity.getExtraInfo();
return extraInfo != null return extraInfo != null
? extraInfo ? extraInfo
@ -1271,7 +1227,7 @@ public class XmlRecordFactory implements Serializable {
private List<String> buildContexts(final String type, final Set<String> contexts) { private List<String> buildContexts(final String type, final Set<String> contexts) {
final List<String> res = Lists.newArrayList(); final List<String> res = Lists.newArrayList();
if ((contextMapper != null) if (contextMapper != null
&& !contextMapper.isEmpty() && !contextMapper.isEmpty()
&& MainEntityType.result.toString().equals(type)) { && MainEntityType.result.toString().equals(type)) {
@ -1302,8 +1258,7 @@ public class XmlRecordFactory implements Serializable {
if (def.getName().equals("category")) { if (def.getName().equals("category")) {
final String rootId = substringBefore(def.getId(), "::"); final String rootId = substringBefore(def.getId(), "::");
document = addContextDef( document = addContextDef(
document.gotoRoot().gotoTag("//context[./@id='" + rootId + "']", new Object()), document.gotoRoot().gotoTag("//context[./@id='" + rootId + "']", new Object()), def);
def);
} }
if (def.getName().equals("concept")) { if (def.getName().equals("concept")) {
@ -1327,17 +1282,17 @@ public class XmlRecordFactory implements Serializable {
private Transformer getTransformer() { private Transformer getTransformer() {
try { try {
Transformer transformer = TransformerFactory.newInstance().newTransformer(); final Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
return transformer; return transformer;
} catch (TransformerConfigurationException e) { } catch (final TransformerConfigurationException e) {
throw new IllegalStateException("unable to create javax.xml.transform.Transformer", e); throw new IllegalStateException("unable to create javax.xml.transform.Transformer", e);
} }
} }
private XMLTag addContextDef(final XMLTag tag, final ContextDef def) { private XMLTag addContextDef(final XMLTag tag, final ContextDef def) {
tag.addTag(def.getName()).addAttribute("id", def.getId()).addAttribute("label", def.getLabel()); tag.addTag(def.getName()).addAttribute("id", def.getId()).addAttribute("label", def.getLabel());
if ((def.getType() != null) && !def.getType().isEmpty()) { if (def.getType() != null && !def.getType().isEmpty()) {
tag.addAttribute("type", def.getType()); tag.addAttribute("type", def.getType());
} }
return tag; return tag;
@ -1374,16 +1329,14 @@ public class XmlRecordFactory implements Serializable {
if (level0 != null) { if (level0 != null) {
final String level0Id = Joiner.on("::").join(funderShortName, level0.valueOf("./name")); final String level0Id = Joiner.on("::").join(funderShortName, level0.valueOf("./name"));
contextMapper contextMapper
.put( .put(level0Id, new ContextDef(level0Id, level0.valueOf("./description"), "category", ""));
level0Id, new ContextDef(level0Id, level0.valueOf("./description"), "category", ""));
final Node level1 = fundingPath.selectSingleNode("//funding_level_1"); final Node level1 = fundingPath.selectSingleNode("//funding_level_1");
if (level1 == null) { if (level1 == null) {
contexts.add(level0Id); contexts.add(level0Id);
} else { } else {
final String level1Id = Joiner.on("::").join(level0Id, level1.valueOf("./name")); final String level1Id = Joiner.on("::").join(level0Id, level1.valueOf("./name"));
contextMapper contextMapper
.put( .put(level1Id, new ContextDef(level1Id, level1.valueOf("./description"), "concept", ""));
level1Id, new ContextDef(level1Id, level1.valueOf("./description"), "concept", ""));
final Node level2 = fundingPath.selectSingleNode("//funding_level_2"); final Node level2 = fundingPath.selectSingleNode("//funding_level_2");
if (level2 == null) { if (level2 == null) {
contexts.add(level1Id); contexts.add(level1Id);
@ -1391,8 +1344,7 @@ public class XmlRecordFactory implements Serializable {
final String level2Id = Joiner.on("::").join(level1Id, level2.valueOf("./name")); final String level2Id = Joiner.on("::").join(level1Id, level2.valueOf("./name"));
contextMapper contextMapper
.put( .put(
level2Id, level2Id, new ContextDef(level2Id, level2.valueOf("./description"), "concept", ""));
new ContextDef(level2Id, level2.valueOf("./description"), "concept", ""));
contexts.add(level2Id); contexts.add(level2Id);
} }
} }
@ -1413,8 +1365,7 @@ public class XmlRecordFactory implements Serializable {
funding += getFunderElement(ftree); funding += getFunderElement(ftree);
for (final Object o : Lists for (final Object o : Lists
.reverse( .reverse(ftree.selectNodes("//fundingtree//*[starts-with(local-name(),'funding_level_')]"))) {
ftree.selectNodes("//fundingtree//*[starts-with(local-name(),'funding_level_')]"))) {
final Element e = (Element) o; final Element e = (Element) o;
final String _id = e.valueOf("./id"); final String _id = e.valueOf("./id");
funding += "<" funding += "<"

6
dhp-workflows/dhp-graph-provision/src/main/resources/eu/dnetlib/dhp/oa/provision/input_params_xml_converter.json
View File

@ -16,11 +16,5 @@
"paramLongName": "isLookupUrl", "paramLongName": "isLookupUrl",
"paramDescription": "URL of the isLookUp Service", "paramDescription": "URL of the isLookUp Service",
"paramRequired": true "paramRequired": true
},
{
"paramName": "odt",
"paramLongName": "otherDsTypeId",
"paramDescription": "list of datasource types to populate field datasourcetypeui",
"paramRequired": true
} }
] ]

5
dhp-workflows/dhp-graph-provision/src/main/resources/eu/dnetlib/dhp/oa/provision/oozie_app/workflow.xml
View File

@ -25,10 +25,6 @@
<name>targetMaxRelations</name> <name>targetMaxRelations</name>
<description>maximum number of relations allowed for a each entity grouping by target</description> <description>maximum number of relations allowed for a each entity grouping by target</description>
</property> </property>
<property>
<name>otherDsTypeId</name>
<description>mapping used to populate datasourceTypeUi field</description>
</property>
<property> <property>
<name>format</name> <name>format</name>
<description>metadata format name (DMF|TMF)</description> <description>metadata format name (DMF|TMF)</description>
@ -582,7 +578,6 @@
<arg>--inputPath</arg><arg>${workingDir}/join_entities</arg> <arg>--inputPath</arg><arg>${workingDir}/join_entities</arg>
<arg>--outputPath</arg><arg>${workingDir}/xml</arg> <arg>--outputPath</arg><arg>${workingDir}/xml</arg>
<arg>--isLookupUrl</arg><arg>${isLookupUrl}</arg> <arg>--isLookupUrl</arg><arg>${isLookupUrl}</arg>
<arg>--otherDsTypeId</arg><arg>${otherDsTypeId}</arg>
</spark> </spark>
<ok to="should_index"/> <ok to="should_index"/>
<error to="Kill"/> <error to="Kill"/>

36
dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/IndexRecordTransformerTest.java
View File

@ -4,7 +4,6 @@ package eu.dnetlib.dhp.oa.provision;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.IOException; import java.io.IOException;
import java.util.List;
import javax.xml.transform.Transformer; import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerException;
@ -16,11 +15,9 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import eu.dnetlib.dhp.oa.provision.model.JoinedEntity; import eu.dnetlib.dhp.oa.provision.model.JoinedEntity;
import eu.dnetlib.dhp.oa.provision.model.RelatedEntity;
import eu.dnetlib.dhp.oa.provision.model.RelatedEntityWrapper; import eu.dnetlib.dhp.oa.provision.model.RelatedEntityWrapper;
import eu.dnetlib.dhp.oa.provision.utils.ContextMapper; import eu.dnetlib.dhp.oa.provision.utils.ContextMapper;
import eu.dnetlib.dhp.oa.provision.utils.StreamingInputDocumentFactory; import eu.dnetlib.dhp.oa.provision.utils.StreamingInputDocumentFactory;
@ -49,7 +46,7 @@ public class IndexRecordTransformerTest {
@Test @Test
public void testPreBuiltRecordTransformation() throws IOException, TransformerException { public void testPreBuiltRecordTransformation() throws IOException, TransformerException {
String record = IOUtils.toString(getClass().getResourceAsStream("record.xml")); final String record = IOUtils.toString(getClass().getResourceAsStream("record.xml"));
testRecordTransformation(record); testRecordTransformation(record);
} }
@ -57,14 +54,14 @@ public class IndexRecordTransformerTest {
@Test @Test
public void testPublicationRecordTransformation() throws IOException, TransformerException { public void testPublicationRecordTransformation() throws IOException, TransformerException {
XmlRecordFactory xmlRecordFactory = new XmlRecordFactory(contextMapper, false, XmlConverterJob.schemaLocation, final XmlRecordFactory xmlRecordFactory = new XmlRecordFactory(contextMapper, false,
XmlRecordFactoryTest.otherDsTypeId); XmlConverterJob.schemaLocation);
Publication p = load("publication.json", Publication.class); final Publication p = load("publication.json", Publication.class);
Project pj = load("project.json", Project.class); final Project pj = load("project.json", Project.class);
Relation rel = load("relToValidatedProject.json", Relation.class); final Relation rel = load("relToValidatedProject.json", Relation.class);
JoinedEntity je = new JoinedEntity<>(p); final JoinedEntity je = new JoinedEntity<>(p);
je je
.setLinks( .setLinks(
Lists Lists
@ -72,24 +69,25 @@ public class IndexRecordTransformerTest {
new RelatedEntityWrapper(rel, new RelatedEntityWrapper(rel,
CreateRelatedEntitiesJob_phase1.asRelatedEntity(pj, Project.class)))); CreateRelatedEntitiesJob_phase1.asRelatedEntity(pj, Project.class))));
String record = xmlRecordFactory.build(je); final String record = xmlRecordFactory.build(je);
assertNotNull(record); assertNotNull(record);
testRecordTransformation(record); testRecordTransformation(record);
} }
private void testRecordTransformation(String record) throws IOException, TransformerException { private void testRecordTransformation(final String record) throws IOException, TransformerException {
String fields = IOUtils.toString(getClass().getResourceAsStream("fields.xml")); final String fields = IOUtils.toString(getClass().getResourceAsStream("fields.xml"));
String xslt = IOUtils.toString(getClass().getResourceAsStream("layoutToRecordTransformer.xsl")); final String xslt = IOUtils.toString(getClass().getResourceAsStream("layoutToRecordTransformer.xsl"));
String transformer = XmlIndexingJob.getLayoutTransformer("DMF", fields, xslt); final String transformer = XmlIndexingJob.getLayoutTransformer("DMF", fields, xslt);
Transformer tr = SaxonTransformerFactory.newInstance(transformer); final Transformer tr = SaxonTransformerFactory.newInstance(transformer);
String indexRecordXML = XmlIndexingJob.toIndexRecord(tr, record); final String indexRecordXML = XmlIndexingJob.toIndexRecord(tr, record);
SolrInputDocument solrDoc = new StreamingInputDocumentFactory(VERSION, DSID).parseDocument(indexRecordXML); final SolrInputDocument solrDoc = new StreamingInputDocumentFactory(VERSION, DSID)
.parseDocument(indexRecordXML);
final String xmlDoc = ClientUtils.toXML(solrDoc); final String xmlDoc = ClientUtils.toXML(solrDoc);
@ -97,7 +95,7 @@ public class IndexRecordTransformerTest {
System.out.println(xmlDoc); System.out.println(xmlDoc);
} }
private <T> T load(String fileName, Class<T> clazz) throws IOException { private <T> T load(final String fileName, final Class<T> clazz) throws IOException {
return XmlRecordFactoryTest.OBJECT_MAPPER return XmlRecordFactoryTest.OBJECT_MAPPER
.readValue(IOUtils.toString(getClass().getResourceAsStream(fileName)), clazz); .readValue(IOUtils.toString(getClass().getResourceAsStream(fileName)), clazz);
} }

70
dhp-workflows/dhp-graph-provision/src/test/java/eu/dnetlib/dhp/oa/provision/XmlRecordFactoryTest.java
View File

@ -1,7 +1,8 @@
package eu.dnetlib.dhp.oa.provision; package eu.dnetlib.dhp.oa.provision;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
@ -29,27 +30,25 @@ import eu.dnetlib.dhp.schema.oaf.Relation;
public class XmlRecordFactoryTest { public class XmlRecordFactoryTest {
public static final String otherDsTypeId = "scholarcomminfra,infospace,pubsrepository::mock,entityregistry,entityregistry::projects,entityregistry::repositories,websource";
public static ObjectMapper OBJECT_MAPPER = new ObjectMapper() public static ObjectMapper OBJECT_MAPPER = new ObjectMapper()
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@Test @Test
public void testXMLRecordFactory() throws IOException, DocumentException { public void testXMLRecordFactory() throws IOException, DocumentException {
ContextMapper contextMapper = new ContextMapper(); final ContextMapper contextMapper = new ContextMapper();
XmlRecordFactory xmlRecordFactory = new XmlRecordFactory(contextMapper, false, XmlConverterJob.schemaLocation, final XmlRecordFactory xmlRecordFactory = new XmlRecordFactory(contextMapper, false,
otherDsTypeId); XmlConverterJob.schemaLocation);
Publication p = OBJECT_MAPPER final Publication p = OBJECT_MAPPER
.readValue(IOUtils.toString(getClass().getResourceAsStream("publication.json")), Publication.class); .readValue(IOUtils.toString(getClass().getResourceAsStream("publication.json")), Publication.class);
String xml = xmlRecordFactory.build(new JoinedEntity<>(p)); final String xml = xmlRecordFactory.build(new JoinedEntity<>(p));
assertNotNull(xml); assertNotNull(xml);
Document doc = new SAXReader().read(new StringReader(xml)); final Document doc = new SAXReader().read(new StringReader(xml));
assertNotNull(doc); assertNotNull(doc);
@ -72,30 +71,29 @@ public class XmlRecordFactoryTest {
@Test @Test
public void testXMLRecordFactoryWithValidatedProject() throws IOException, DocumentException { public void testXMLRecordFactoryWithValidatedProject() throws IOException, DocumentException {
ContextMapper contextMapper = new ContextMapper(); final ContextMapper contextMapper = new ContextMapper();
XmlRecordFactory xmlRecordFactory = new XmlRecordFactory(contextMapper, false, XmlConverterJob.schemaLocation, final XmlRecordFactory xmlRecordFactory = new XmlRecordFactory(contextMapper, false,
otherDsTypeId); XmlConverterJob.schemaLocation);
Publication p = OBJECT_MAPPER final Publication p = OBJECT_MAPPER
.readValue(IOUtils.toString(getClass().getResourceAsStream("publication.json")), Publication.class); .readValue(IOUtils.toString(getClass().getResourceAsStream("publication.json")), Publication.class);
Project pj = OBJECT_MAPPER final Project pj = OBJECT_MAPPER
.readValue(IOUtils.toString(getClass().getResourceAsStream("project.json")), Project.class); .readValue(IOUtils.toString(getClass().getResourceAsStream("project.json")), Project.class);
Relation rel = OBJECT_MAPPER final Relation rel = OBJECT_MAPPER
.readValue( .readValue(IOUtils.toString(getClass().getResourceAsStream("relToValidatedProject.json")), Relation.class);
(IOUtils.toString(getClass().getResourceAsStream("relToValidatedProject.json"))), Relation.class); final RelatedEntity relatedProject = CreateRelatedEntitiesJob_phase1.asRelatedEntity(pj, Project.class);
RelatedEntity relatedProject = CreateRelatedEntitiesJob_phase1.asRelatedEntity(pj, Project.class); final List<RelatedEntityWrapper> links = Lists.newArrayList();
List<RelatedEntityWrapper> links = Lists.newArrayList(); final RelatedEntityWrapper rew = new RelatedEntityWrapper(rel, relatedProject);
RelatedEntityWrapper rew = new RelatedEntityWrapper(rel, relatedProject);
links.add(rew); links.add(rew);
JoinedEntity je = new JoinedEntity<>(p); final JoinedEntity je = new JoinedEntity<>(p);
je.setLinks(links); je.setLinks(links);
String xml = xmlRecordFactory.build(je); final String xml = xmlRecordFactory.build(je);
assertNotNull(xml); assertNotNull(xml);
Document doc = new SAXReader().read(new StringReader(xml)); final Document doc = new SAXReader().read(new StringReader(xml));
assertNotNull(doc); assertNotNull(doc);
System.out.println(doc.asXML()); System.out.println(doc.asXML());
Assertions.assertEquals("2021-01-01", doc.valueOf("//validated/@date")); Assertions.assertEquals("2021-01-01", doc.valueOf("//validated/@date"));
@ -104,29 +102,29 @@ public class XmlRecordFactoryTest {
@Test @Test
public void testXMLRecordFactoryWithNonValidatedProject() throws IOException, DocumentException { public void testXMLRecordFactoryWithNonValidatedProject() throws IOException, DocumentException {
ContextMapper contextMapper = new ContextMapper(); final ContextMapper contextMapper = new ContextMapper();
XmlRecordFactory xmlRecordFactory = new XmlRecordFactory(contextMapper, false, XmlConverterJob.schemaLocation, final XmlRecordFactory xmlRecordFactory = new XmlRecordFactory(contextMapper, false,
otherDsTypeId); XmlConverterJob.schemaLocation);
Publication p = OBJECT_MAPPER final Publication p = OBJECT_MAPPER
.readValue(IOUtils.toString(getClass().getResourceAsStream("publication.json")), Publication.class); .readValue(IOUtils.toString(getClass().getResourceAsStream("publication.json")), Publication.class);
Project pj = OBJECT_MAPPER final Project pj = OBJECT_MAPPER
.readValue(IOUtils.toString(getClass().getResourceAsStream("project.json")), Project.class); .readValue(IOUtils.toString(getClass().getResourceAsStream("project.json")), Project.class);
Relation rel = OBJECT_MAPPER final Relation rel = OBJECT_MAPPER
.readValue((IOUtils.toString(getClass().getResourceAsStream("relToProject.json"))), Relation.class); .readValue(IOUtils.toString(getClass().getResourceAsStream("relToProject.json")), Relation.class);
RelatedEntity relatedProject = CreateRelatedEntitiesJob_phase1.asRelatedEntity(pj, Project.class); final RelatedEntity relatedProject = CreateRelatedEntitiesJob_phase1.asRelatedEntity(pj, Project.class);
List<RelatedEntityWrapper> links = Lists.newArrayList(); final List<RelatedEntityWrapper> links = Lists.newArrayList();
RelatedEntityWrapper rew = new RelatedEntityWrapper(rel, relatedProject); final RelatedEntityWrapper rew = new RelatedEntityWrapper(rel, relatedProject);
links.add(rew); links.add(rew);
JoinedEntity je = new JoinedEntity<>(p); final JoinedEntity je = new JoinedEntity<>(p);
je.setLinks(links); je.setLinks(links);
String xml = xmlRecordFactory.build(je); final String xml = xmlRecordFactory.build(je);
assertNotNull(xml); assertNotNull(xml);
Document doc = new SAXReader().read(new StringReader(xml)); final Document doc = new SAXReader().read(new StringReader(xml));
assertNotNull(doc); assertNotNull(doc);
System.out.println(doc.asXML()); System.out.println(doc.asXML());
assertEquals("", doc.valueOf("//rel/validated")); assertEquals("", doc.valueOf("//rel/validated"));

2
pom.xml
View File

@ -736,7 +736,7 @@
<mockito-core.version>3.3.3</mockito-core.version> <mockito-core.version>3.3.3</mockito-core.version>
<mongodb.driver.version>3.4.2</mongodb.driver.version> <mongodb.driver.version>3.4.2</mongodb.driver.version>
<vtd.version>[2.12,3.0)</vtd.version> <vtd.version>[2.12,3.0)</vtd.version>
<dhp-schemas.version>[2.7.14]</dhp-schemas.version> <dhp-schemas.version>[2.7.15-SNAPSHOT]</dhp-schemas.version>
<dnet-actionmanager-api.version>[4.0.3]</dnet-actionmanager-api.version> <dnet-actionmanager-api.version>[4.0.3]</dnet-actionmanager-api.version>
<dnet-actionmanager-common.version>[6.0.5]</dnet-actionmanager-common.version> <dnet-actionmanager-common.version>[6.0.5]</dnet-actionmanager-common.version>
<dnet-openaire-broker-common.version>[3.1.6]</dnet-openaire-broker-common.version> <dnet-openaire-broker-common.version>[3.1.6]</dnet-openaire-broker-common.version>