D-Net
/
dnet-hadoop
13
4
Fork 10
Code Issues 14 Pull Requests 8 Projects 2 Releases 1 Wiki Activity

WIP: Graph footprint optimisation #287

Draft
claudio.atzori wants to merge 39 commits from ticket_8369 into beta
pull from: ticket_8369
merge into: D-Net:beta
Conversation 0 Commits 39 Files Changed 262 +15 -18
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 883dcd910e - Show all commits

2
dhp-common/src/test/java/eu/dnetlib/dhp/common/MdStoreClientTest.java
View File

@ -15,7 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
public class MdStoreClientTest { public class MdStoreClientTest {
@Test
public void testMongoCollection() throws IOException { public void testMongoCollection() throws IOException {
final MdstoreClient client = new MdstoreClient("mongodb://localhost:27017", "mdstore"); final MdstoreClient client = new MdstoreClient("mongodb://localhost:27017", "mdstore");

25
dhp-common/src/test/java/eu/dnetlib/dhp/common/vocabulary/VocabularyTest.java
View File

@ -1,25 +1,21 @@
package eu.dnetlib.dhp.common.vocabulary; package eu.dnetlib.dhp.common.vocabulary;
import static org.mockito.Mockito.lenient; import eu.dnetlib.dhp.schema.oaf.Qualifier;
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
import java.io.IOException; import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
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 org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoExtension;
import eu.dnetlib.dhp.schema.oaf.Qualifier; import java.io.IOException;
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException; import java.util.List;
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService; import java.util.Objects;
import static org.mockito.Mockito.lenient;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
public class VocabularyTest { public class VocabularyTest {
@ -69,11 +65,12 @@ public class VocabularyTest {
} else { } else {
System.out.println("syn=" + s1 + " term = " + t1.getClassid() + " " + t1.getClassname()); System.out.println("syn=" + s1 + " term = " + t1.getClassid() + " " + t1.getClassname());
Qualifier synonymAsQualifier = vocabularies.getSynonymAsQualifier("dnet:result_typologies", t1.getClassid());
if (synonymAsQualifier!= null)
System.out System.out
.println( .println(
vocabularies.getSynonymAsQualifier("dnet:result_typologies", t1.getClassid()).getClassname()); synonymAsQualifier.getClassname());
} }
} }
} }
} }

2
dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/orp-rohub.json
View File

@ -50,7 +50,7 @@
"pid": [] "pid": []
} }
], ],
"resulttype": "other", "resulttype": "otherresearchproduct",
"language": { "language": {
"classid": "UNKNOWN", "classid": "UNKNOWN",
"classname": "Unknown", "classname": "Unknown",

4
dhp-workflows/dhp-aggregation/src/main/scala/eu/dnetlib/dhp/datacite/DataciteToOAFTransformation.scala
View File

@ -639,9 +639,9 @@ object DataciteToOAFTransformation {
Relation.RELCLASS.exists(r.relationType) && validIdentifiersInRelation(r.relatedIdentifierType) Relation.RELCLASS.exists(r.relationType) && validIdentifiersInRelation(r.relatedIdentifierType)
) )
.map(r => { .map(r => {
val subRelType = Relation.SUBRELTYPE.valueOf(r.relationType) val rc = Relation.RELCLASS.valueOf(r.relationType)
val target = DHPUtils.generateUnresolvedIdentifier(r.relatedIdentifier, r.relatedIdentifierType) val target = DHPUtils.generateUnresolvedIdentifier(r.relatedIdentifier, r.relatedIdentifierType)
relation(id, target, subRelType, Relation.RELCLASS.valueOf(r.relationType), date) relation(id, target, rc.getSubRel, rc, date)
}) })
val citationRels: List[Relation] = rels val citationRels: List[Relation] = rels
.filter(r =>validIdentifiersInRelation(r.relatedIdentifierType) && .filter(r =>validIdentifiersInRelation(r.relatedIdentifierType) &&