master #59

Closed
claudio.atzori wants to merge 3221 commits from master into stable_ids
3 changed files with 9 additions and 9 deletions
Showing only changes of commit b3f3b895e5 - Show all commits

View File

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

View File

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

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-
*/
public enum OAStatus {
public enum OpenAccessRoute {
gold, green, hybrid, bronze