Skip to content

Commit

Permalink
Accept older versions of CodeScene too and use the risk description t…
Browse files Browse the repository at this point in the history
…o recommend an upgrade
  • Loading branch information
adamtornhill committed Oct 12, 2018
1 parent 5684bec commit a5c105b
Showing 1 changed file with 12 additions and 4 deletions.
Expand Up @@ -20,7 +20,7 @@ public DeltaAnalysisResult(final Commits commits, final JsonObject result) {
viewUrl = result.getString("view");
risk = riskFrom(deltaResult);
warnings = warningsFrom(deltaResult);
description = descriptionOfRiskFrom(deltaResult);
description = descriptionOfRiskFrom(deltaResult, versionOf(result));
this.commits = commits;
}

Expand Down Expand Up @@ -52,18 +52,26 @@ private static Warnings warningsFrom(JsonObject deltaResult) {
return ws;
}

private RiskDescription descriptionOfRiskFrom(JsonObject deltaResult) {
private RiskDescription descriptionOfRiskFrom(JsonObject deltaResult, final String version) {
if (version.equals("1")) {
return new RiskDescription("No risk description available: upgrade CodeScene");
}

return new RiskDescription(deltaResult.getString("description"));
}

private void ensureTheVersionIsSupported(JsonObject result) {
final String version = result.getString("version");
final String version = versionOf(result);

if (!version.equals("2")) {
if (!version.equals("1") || !version.equals("2")) {
throw new RuntimeException("The CodeScene API reports version " + version + ", which we don't support. You need to upgrade CodeScene.");
}
}

private static String versionOf(JsonObject result) {
return result.getString("version");
}

public String getViewUrl() {
return viewUrl;
}
Expand Down

0 comments on commit a5c105b

Please sign in to comment.