forked from D-Net/dnet-hadoop
Compare commits
No commits in common. "3ef5eec3a6c45ad7df05b5ef23e87e283b7c206f" and "e53a606afc86123fa8fed47ca23a7ca49c7bc680" have entirely different histories.
3ef5eec3a6
...
e53a606afc
|
@ -50,8 +50,6 @@ public class BioSchemaProtein {
|
||||||
private Link mainEntityOfPage;
|
private Link mainEntityOfPage;
|
||||||
@JsonProperty("https://schema.org/citation")
|
@JsonProperty("https://schema.org/citation")
|
||||||
private Citation citation;
|
private Citation citation;
|
||||||
@JsonProperty("https://schema.org/hasSequenceAnnotation")
|
|
||||||
private SequenceAnnotation sequenceAnnotation;
|
|
||||||
|
|
||||||
public String getId() {
|
public String getId() {
|
||||||
return id;
|
return id;
|
||||||
|
@ -192,14 +190,6 @@ public class BioSchemaProtein {
|
||||||
this.mainEntityOfPage = mainEntityOfPage;
|
this.mainEntityOfPage = mainEntityOfPage;
|
||||||
}
|
}
|
||||||
|
|
||||||
public SequenceAnnotation getSequenceAnnotation() {
|
|
||||||
return sequenceAnnotation;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSequenceAnnotation(SequenceAnnotation sequenceAnnotation) {
|
|
||||||
this.sequenceAnnotation = sequenceAnnotation;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Citation getCitation() {
|
public Citation getCitation() {
|
||||||
return citation;
|
return citation;
|
||||||
}
|
}
|
||||||
|
@ -357,65 +347,6 @@ public class BioSchemaProtein {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class SequenceAnnotation {
|
|
||||||
@JsonProperty("https://schema.org/additionalProperty")
|
|
||||||
private List<AdditionalProperty> additionalProperty;
|
|
||||||
|
|
||||||
public List<AdditionalProperty> getAdditionalProperty() {
|
|
||||||
return additionalProperty;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setAdditionalProperty(List<AdditionalProperty> additionalProperty) {
|
|
||||||
this.additionalProperty = additionalProperty;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class AdditionalProperty {
|
|
||||||
@JsonProperty("https://schema.org/value")
|
|
||||||
private List<PropertyValue> propertyValue;
|
|
||||||
|
|
||||||
public List<PropertyValue> getPropertyValue() {
|
|
||||||
return propertyValue;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPropertyValue(List<PropertyValue> propertyValue) {
|
|
||||||
this.propertyValue = propertyValue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class PropertyValue {
|
|
||||||
@JsonProperty("@id")
|
|
||||||
private String id;
|
|
||||||
@JsonProperty("https://schema.org/termCode")
|
|
||||||
private String termCode;
|
|
||||||
@JsonProperty("https://schema.org/name")
|
|
||||||
private String name;
|
|
||||||
|
|
||||||
public String getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(String id) {
|
|
||||||
this.id = id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTermCode() {
|
|
||||||
return termCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTermCode(String termCode) {
|
|
||||||
this.termCode = termCode;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName() {
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setName(String name) {
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getId() {
|
public String getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
|
@ -161,7 +161,7 @@ public class RDFConverter {
|
||||||
|
|
||||||
if (entry.getSameAs() != null) {
|
if (entry.getSameAs() != null) {
|
||||||
entry.getSameAs().stream().filter(Objects::nonNull).forEach(sameAs -> {
|
entry.getSameAs().stream().filter(Objects::nonNull).forEach(sameAs -> {
|
||||||
log.debug("sameAs value: " + sameAs.getId());
|
log.debug("sameAs: " + sameAs.getId());
|
||||||
addRelatedIdentifier(dataciteProtein, sameAs.getId(), "IsIdenticalTo");
|
addRelatedIdentifier(dataciteProtein, sameAs.getId(), "IsIdenticalTo");
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -173,10 +173,6 @@ public class RDFConverter {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (entry.getSequenceAnnotation() !=null) {
|
|
||||||
log.debug("Sequence Annotation found " );
|
|
||||||
}
|
|
||||||
|
|
||||||
String proteinId = "";
|
String proteinId = "";
|
||||||
try {
|
try {
|
||||||
String[] identifierParts = dataciteProtein.getIdentifiers().get(0).getIdentifier().split("/");
|
String[] identifierParts = dataciteProtein.getIdentifiers().get(0).getIdentifier().split("/");
|
||||||
|
|
|
@ -38,8 +38,6 @@
|
||||||
<module>dhp-usage-raw-data-update</module>
|
<module>dhp-usage-raw-data-update</module>
|
||||||
<module>dhp-broker-events</module>
|
<module>dhp-broker-events</module>
|
||||||
<module>dhp-doiboost</module>
|
<module>dhp-doiboost</module>
|
||||||
<module>dhp-rdfconverter</module>
|
|
||||||
<module>dhp-bmuse</module>
|
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<pluginRepositories>
|
<pluginRepositories>
|
||||||
|
|
12
pom.xml
12
pom.xml
|
@ -105,18 +105,6 @@
|
||||||
<enabled>false</enabled>
|
<enabled>false</enabled>
|
||||||
</snapshots>
|
</snapshots>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
|
||||||
<id>dnet-deps</id>
|
|
||||||
<name>D-Net Dependencies</name>
|
|
||||||
<url>https://maven.d4science.org/nexus/content/repositories/dnet-deps/</url>
|
|
||||||
<releases>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
</releases>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
</snapshots>
|
|
||||||
<layout>default</layout>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
Loading…
Reference in New Issue