DD-648 fix for allow custom terms #130
Conversation
src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
Outdated
Show resolved
Hide resolved
| try { | ||
| return licenseService.getByNameOrUri(licenseNameOrUri); | ||
| } catch (NoResultException nre){ | ||
| throw new JsonParseException("Couldn't find an active license with: " + licenseNameOrUri); |
There was a problem hiding this comment.
@mderuijter : is really a JSON parsing problem??
There was a problem hiding this comment.
@janvanmansum no, I see now that it's a silly mistake. My train of thought was that only JsonParseExceptions are used here and I had to use that for catching the NoResultException, I realize now it is wrong.
I need to readjust that anyway according to the other exception refactoring
There was a problem hiding this comment.
@janvanmansum had another look at the code in this class and the JsonParseException is actually used for every error that happens during the parsing process: JsonParser.java#L575-L582.
So I will change my code and remove the NoResultException try-catch and return a JsonParseException if the License == null
What this PR does / why we need it:
Only sets a custom license when :AllowCustomLicense is set to true, otherwise default license is used
Which issue(s) this PR closes:
Closes #DD-648
For testing see issue