hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TLC-380] Fix checkstyle and duplicate code

Browse Source
This commit is contained in:
Kim Shepherd
2022-11-22 16:15:40 +13:00
parent 3fe4fd192f
commit 14b5f0e343
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dspace-api/src/main/java/org/dspace/browse/CrossLinks.java
View File

@@ -59,23 +59,7 @@ public class CrossLinks {
* @return true/false
*/
public boolean hasLink(String metadata) {
// Resolve wildcards properly, eg. dc.subject.other matches a configuration for dc.subject.*
for (String key : links.keySet()) {
if (null != key && key.endsWith(".*")) {
// A substring of length-1, also substracting the wildcard should work as a "startsWith"
// check for the field eg. dc.subject.* -> dc.subject is the start of dc.subject.other
if (null != metadata && metadata.startsWith(key.substring(0, key.length()-1 - ".*".length()))) {
return true;
}
} else {
// Exact match, if the key field has no .* wildcard
if (links.containsKey(metadata)) {
return true;
}
}
}
return false;
return findLinkType(metadata) != null;
}
/**
@@ -118,7 +102,7 @@ public class CrossLinks {
if (null != key && key.endsWith(".*")) {
// A substring of length-1, also substracting the wildcard should work as a "startsWith"
// check for the field eg. dc.subject.* -> dc.subject is the start of dc.subject.other
if (null != metadata && metadata.startsWith(key.substring(0, key.length()-1 - ".*".length()))) {
if (null != metadata && metadata.startsWith(key.substring(0, key.length() - 1 - ".*".length()))) {
return links.get(key);
}
} else {