michele.artini
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

code formatting

This commit is contained in:
Claudio Atzori 2020-11-24 14:41:39 +01:00
parent c016cc050a
commit e43ab07af6
4 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java
View File

@ -48,27 +48,32 @@ public class IdentifierFactory implements Serializable {
} }
Map<String, List<StructuredProperty>> pids = entity Map<String, List<StructuredProperty>> pids = entity
.getPid() .getPid()
.stream() .stream()
.filter(s -> pidFilter(s)) .filter(s -> pidFilter(s))
.collect( .collect(
Collectors.groupingBy(p -> p.getQualifier().getClassid(), Collectors
Collectors.mapping(p -> p, Collectors.toList())) .groupingBy(
); p -> p.getQualifier().getClassid(),
Collectors.mapping(p -> p, Collectors.toList())));
return pids return pids
.values() .values()
.stream() .stream()
.flatMap(s -> s.stream()) .flatMap(s -> s.stream())
.min(new PidComparator<>(entity)) .min(new PidComparator<>(entity))
.map(min -> Optional.ofNullable(pids.get(min.getQualifier().getClassid())) .map(
.map(p -> p.stream() min -> Optional
.sorted(new PidValueComparator()) .ofNullable(pids.get(min.getQualifier().getClassid()))
.findFirst() .map(
.map(s -> idFromPid(entity, s)) p -> p
.orElseGet(entity::getId)) .stream()
.orElseGet(entity::getId)) .sorted(new PidValueComparator())
.orElseGet(entity::getId); .findFirst()
.map(s -> idFromPid(entity, s))
.orElseGet(entity::getId))
.orElseGet(entity::getId))
.orElseGet(entity::getId);
} }
protected static boolean pidFilter(StructuredProperty s) { protected static boolean pidFilter(StructuredProperty s) {

6
dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OrganizationPidComparator.java
View File

@ -1,10 +1,10 @@
package eu.dnetlib.dhp.schema.oaf.utils; package eu.dnetlib.dhp.schema.oaf.utils;
import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
import java.util.Comparator; import java.util.Comparator;
import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
public class OrganizationPidComparator implements Comparator<StructuredProperty> { public class OrganizationPidComparator implements Comparator<StructuredProperty> {
@Override @Override
@ -12,7 +12,7 @@ public class OrganizationPidComparator implements Comparator<StructuredProperty>
PidType lClass = PidType.valueOf(left.getQualifier().getClassid()); PidType lClass = PidType.valueOf(left.getQualifier().getClassid());
PidType rClass = PidType.valueOf(right.getQualifier().getClassid()); PidType rClass = PidType.valueOf(right.getQualifier().getClassid());
if (lClass.equals(PidType.GRID)) if (lClass.equals(PidType.GRID))
return -1; return -1;
if (rClass.equals(PidType.GRID)) if (rClass.equals(PidType.GRID))

19
dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidValueComparator.java
View File

@ -1,6 +1,9 @@
package eu.dnetlib.dhp.schema.oaf.utils; package eu.dnetlib.dhp.schema.oaf.utils;
import java.util.Comparator;
import java.util.Optional;
import eu.dnetlib.dhp.oa.graph.clean.CleaningFunctions; import eu.dnetlib.dhp.oa.graph.clean.CleaningFunctions;
import eu.dnetlib.dhp.schema.common.ModelSupport; import eu.dnetlib.dhp.schema.common.ModelSupport;
import eu.dnetlib.dhp.schema.oaf.OafEntity; import eu.dnetlib.dhp.schema.oaf.OafEntity;
@ -8,9 +11,6 @@ import eu.dnetlib.dhp.schema.oaf.Organization;
import eu.dnetlib.dhp.schema.oaf.Result; import eu.dnetlib.dhp.schema.oaf.Result;
import eu.dnetlib.dhp.schema.oaf.StructuredProperty; import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
import java.util.Comparator;
import java.util.Optional;
public class PidValueComparator implements Comparator<StructuredProperty> { public class PidValueComparator implements Comparator<StructuredProperty> {
@Override @Override
@ -26,10 +26,13 @@ public class PidValueComparator implements Comparator<StructuredProperty> {
StructuredProperty l = CleaningFunctions.normalizePidValue(left); StructuredProperty l = CleaningFunctions.normalizePidValue(left);
StructuredProperty r = CleaningFunctions.normalizePidValue(right); StructuredProperty r = CleaningFunctions.normalizePidValue(right);
return Optional.ofNullable(l.getValue()) return Optional
.map(lv -> Optional.ofNullable(r.getValue()) .ofNullable(l.getValue())
.map(rv -> lv.compareTo(rv)) .map(
.orElse(-1)) lv -> Optional
.orElse(1); .ofNullable(r.getValue())
.map(rv -> lv.compareTo(rv))
.orElse(-1))
.orElse(1);
} }
} }

4
dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultPidComparator.java
View File

@ -1,10 +1,10 @@
package eu.dnetlib.dhp.schema.oaf.utils; package eu.dnetlib.dhp.schema.oaf.utils;
import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
import java.util.Comparator; import java.util.Comparator;
import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
public class ResultPidComparator implements Comparator<StructuredProperty> { public class ResultPidComparator implements Comparator<StructuredProperty> {
@Override @Override