Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#8667 fix null pointer exception #8668

Merged
merged 1 commit into from
May 24, 2022
Merged

#8667 fix null pointer exception #8668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 35 additions & 36 deletions src/main/java/edu/harvard/iq/dataverse/DatasetFieldServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,55 +278,54 @@ public Map<Long, JsonObject> getCVocConf(boolean byTermUriField){
if (cvocSetting == null || cvocSetting.isEmpty()) {
oldHash=null;
return new HashMap<>();
}
}
String newHash = DigestUtils.md5Hex(cvocSetting);
if(newHash.equals(oldHash)) {

if (newHash.equals(oldHash)) {
return byTermUriField ? cvocMapByTermUri : cvocMap;
}
oldHash=newHash;
oldHash=newHash;
cvocMap=new HashMap<>();
cvocMapByTermUri=new HashMap<>();

try (JsonReader jsonReader = Json.createReader(new StringReader(settingsService.getValueForKey(SettingsServiceBean.Key.CVocConf)))) {
JsonArray cvocConfJsonArray = jsonReader.readArray();
JsonArray cvocConfJsonArray = jsonReader.readArray();
for (JsonObject jo : cvocConfJsonArray.getValuesAs(JsonObject.class)) {
DatasetFieldType dft = findByNameOpt(jo.getString("field-name"));
if (dft != null) {
cvocMap.put(dft.getId(), jo);
} else {
if (dft == null) {
logger.warning("Ignoring External Vocabulary setting for non-existent field: "
+ jo.getString("field-name"));
}
if (jo.containsKey("term-uri-field")) {
String termUriField = jo.getString("term-uri-field");
if (!dft.isHasChildren()) {
if (termUriField.equals(dft.getName())) {
logger.fine("Found primitive field for term uri : " + dft.getName() + ": " + dft.getId());
cvocMapByTermUri.put(dft.getId(), jo);
}
} else {
DatasetFieldType childdft = findByNameOpt(jo.getString("term-uri-field"));
logger.fine("Found term child field: " + childdft.getName()+ ": " + childdft.getId());
cvocMapByTermUri.put(childdft.getId(), jo);
if (childdft.getParentDatasetFieldType() != dft) {
logger.warning("Term URI field (" + childdft.getDisplayName() + ") not a child of parent: "
+ dft.getDisplayName());
+ jo.getString("field-name"));
} else {
cvocMap.put(dft.getId(), jo);
if (jo.containsKey("term-uri-field")) {
String termUriField = jo.getString("term-uri-field");
if (!dft.isHasChildren()) {
if (termUriField.equals(dft.getName())) {
logger.fine("Found primitive field for term uri : " + dft.getName() + ": " + dft.getId());
cvocMapByTermUri.put(dft.getId(), jo);
}
} else {
DatasetFieldType childdft = findByNameOpt(jo.getString("term-uri-field"));
logger.fine("Found term child field: " + childdft.getName()+ ": " + childdft.getId());
cvocMapByTermUri.put(childdft.getId(), jo);
if (childdft.getParentDatasetFieldType() != dft) {
logger.warning("Term URI field (" + childdft.getDisplayName() + ") not a child of parent: "
+ dft.getDisplayName());
}
}
}
if (dft == null) {
logger.warning("Ignoring External Vocabulary setting for non-existent child field: "
+ jo.getString("term-uri-field"));
}

}if(jo.containsKey("child-fields")) {
JsonArray childFields = jo.getJsonArray("child-fields");
for (JsonString elm : childFields.getValuesAs(JsonString.class)) {
dft = findByNameOpt(elm.getString());
logger.info("Found: " + dft.getName());
if (dft == null) {
logger.warning("Ignoring External Vocabulary setting for non-existent child field: "
+ elm.getString());
+ jo.getString("term-uri-field"));
}
}
if (jo.containsKey("child-fields")) {
JsonArray childFields = jo.getJsonArray("child-fields");
for (JsonString elm : childFields.getValuesAs(JsonString.class)) {
dft = findByNameOpt(elm.getString());
logger.info("Found: " + dft.getName());
if (dft == null) {
logger.warning("Ignoring External Vocabulary setting for non-existent child field: "
+ elm.getString());
}
}
}
}
Expand Down