D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 13 Projects 2 Releases 2 Wiki Activity

orcid-no-doi #43

Merged
claudio.atzori merged 45 commits from enrico.ottonello/dnet-hadoop:orcid-no-doi into master 2020-12-02 10:55:12 +01:00
Conversation 5 Commits 45 Files Changed 68 +8 -2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1139d6568d - Show all commits

8
dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/orcidnodoi/oaf/PublicationToOaf.java
View File

@ -166,7 +166,13 @@ public class PublicationToOaf implements Serializable {
// Adding source // Adding source
final String source = getStringValue(rootElement, "sourceName"); final String source = getStringValue(rootElement, "sourceName");
if (StringUtils.isNotBlank(source)) { if (StringUtils.isNotBlank(source)) {
publication.setSource(Arrays.asList(mapStringField(source, null))); Field<String> sourceField = mapStringField(source, null);
if (sourceField==null) {
publication.setSource(null);
}
else {
publication.setSource(Arrays.asList(sourceField));
}
} }
// Adding titles // Adding titles
claudio.atzori commented 2020-09-21 16:09:36 +02:00
Review
Copy Link

Is the caller expecting the null? Otherwise this would likely produce a NPE.

Is the caller expecting the `null`? Otherwise this would likely produce a NPE.
enrico.ottonello commented 2020-10-22 14:44:57 +02:00
Review
Copy Link

yes, there is a check on null value

yes, there is a check on null value

2
dhp-workflows/dhp-doiboost/src/main/java/eu/dnetlib/doiboost/orcidnodoi/util/DumpToActionsUtility.java
View File

@ -20,7 +20,7 @@ public class DumpToActionsUtility {
public static String getStringValue(final JsonObject root, final String key) { public static String getStringValue(final JsonObject root, final String key) {
if (root.has(key) && !root.get(key).isJsonNull()) if (root.has(key) && !root.get(key).isJsonNull())
return root.get(key).getAsString(); return root.get(key).getAsString();
return null; return new String("");
claudio.atzori commented 2020-09-21 16:14:54 +02:00
Outdated
Review
Copy Link

Is the caller expecting the null? Otherwise this would likely produce a NPE.

Is the caller expecting the null? Otherwise this would likely produce a NPE.
enrico.ottonello commented 2020-10-22 15:31:27 +02:00
Outdated
Review
Copy Link

replaced null value with a more safe empty string

replaced null value with a more safe empty string
} }
public static List<String> getArrayValues(final JsonObject root, final String key) { public static List<String> getArrayValues(final JsonObject root, final String key) {