andreas.czerniak
/
BrBETA_dnet-hadoop
forked from D-Net/dnet-hadoop
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#6282 open access status in the Graph] OAStatus renamed as openAccessRoute

This commit is contained in:
Claudio Atzori 2021-01-12 15:39:18 +01:00
parent 765f9bdee7
commit b3f3b895e5
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,13 +118,13 @@ public class OafMapperUtils {
final String classname, final String classname,
final String schemeid, final String schemeid,
final String schemename, final String schemename,
final OAStatus oaStatus) { final OpenAccessRoute openAccessRoute) {
final AccessRight accessRight = new AccessRight(); final AccessRight accessRight = new AccessRight();
accessRight.setClassid(classid); accessRight.setClassid(classid);
accessRight.setClassname(classname); accessRight.setClassname(classname);
accessRight.setSchemeid(schemeid); accessRight.setSchemeid(schemeid);
accessRight.setSchemename(schemename); accessRight.setSchemename(schemename);
accessRight.setOaStatus(oaStatus); accessRight.setOpenAccessRoute(openAccessRoute);
return accessRight; return accessRight;
} }

12
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/AccessRight.java
View File

@ -8,20 +8,20 @@ import java.util.Optional;
*/ */
public class AccessRight extends Qualifier { public class AccessRight extends Qualifier {
private OAStatus oaStatus; private OpenAccessRoute openAccessRoute;
public OAStatus getOaStatus() { public OpenAccessRoute getOpenAccessRoute() {
return oaStatus; return openAccessRoute;
} }
public void setOaStatus(OAStatus oaStatus) { public void setOpenAccessRoute(OpenAccessRoute openAccessRoute) {
this.oaStatus = oaStatus; this.openAccessRoute = openAccessRoute;
} }
public String toComparableString() { public String toComparableString() {
String s = super.toComparableString(); String s = super.toComparableString();
return Optional return Optional
.ofNullable(getOaStatus()) .ofNullable(getOpenAccessRoute())
.map(x -> s + "::" + x.toString()) .map(x -> s + "::" + x.toString())
.orElse(s); .orElse(s);
} }

2
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OAStatus.java → dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OpenAccessRoute.java
View File

@ -6,7 +6,7 @@ package eu.dnetlib.dhp.schema.oaf;
* *
* https://support.unpaywall.org/support/solutions/articles/44001777288-what-do-the-types-of-oa-status-green-gold-hybrid-and-bronze-mean- * https://support.unpaywall.org/support/solutions/articles/44001777288-what-do-the-types-of-oa-status-green-gold-hybrid-and-bronze-mean-
*/ */
public enum OAStatus { public enum OpenAccessRoute {
gold, green, hybrid, bronze gold, green, hybrid, bronze