Skip to content

FIREFLY-1331: Update CmdVersion response format and version info labels #1951

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

Merged
jaladh-singhal merged 1 commit into from
Apr 29, 2026
Merged

FIREFLY-1331: Update CmdVersion response format and version info labels #1951

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion src/firefly/java/edu/caltech/ipac/firefly/server/AppServerCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,10 @@ public String doCommand(SrvParam params) throws Exception {
}
versionData = versionMap;
}
return Serializer.getJsonMapper().writeValueAsString(versionData);
Map<String, Object> result = new LinkedHashMap<>();
result.put("success", true);
result.put("data", versionData);
return Serializer.getJsonMapper().writeValueAsString(result);
}
}

Expand Down
5 changes: 2 additions & 3 deletions src/firefly/java/edu/caltech/ipac/firefly/server/util/VersionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,11 @@ public static List<KeyVal<String, String>> getVersionInfo() {
Version v = getAppVersion();

List<KeyVal<String, String>> versionInfo = new ArrayList<>(6);
versionInfo.add(new KeyVal<>("Version", getVersionStr(v)));
versionInfo.add(new KeyVal<>("Application Version", getVersionStr(v)));
versionInfo.add(new KeyVal<>("Built On", v.getBuildTime()));
versionInfo.add(new KeyVal<>("Git commit", v.getBuildCommit()));

if (v.getMajor()>0)
versionInfo.add(new KeyVal<>("Firefly Library Version", getFireflyVersionStr(v)));
versionInfo.add(new KeyVal<>("Firefly Version", getFireflyVersionStr(v)));
if (!StringUtils.isEmpty(v.getBuildCommitFirefly()))
versionInfo.add(new KeyVal<>("Firefly Git Commit", v.getBuildCommitFirefly()));
if (!StringUtils.isEmpty(v.getBuildFireflyTag()))
Expand Down