Skip to content

Fix ToolInstallationDescriptor.getGlobalBinPath() and standardize ObjectMapper usage #879

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
rsenden merged 3 commits into from
Dec 9, 2025
Merged

Fix ToolInstallationDescriptor.getGlobalBinPath() and standardize ObjectMapper usage #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9839ed
Initial plan
Copilot Nov 26, 2025
7729805
fix: Correct getGlobalBinPath() to return globalBinDir instead of binDir
Copilot Nov 26, 2025
69b577c
chore: Use JsonHelper.getObjectMapper() consistently instead of new O…
Copilot Nov 26, 2025
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: 2 additions & 3 deletions .../fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolGetCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package com.fortify.cli.tool._common.cli.cmd;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fortify.cli.common.json.JsonHelper;
import com.fortify.cli.common.output.cli.cmd.AbstractOutputCommand;
import com.fortify.cli.common.output.cli.cmd.IJsonNodeSupplier;
import com.fortify.cli.tool._common.helper.Tool;
Expand All @@ -34,7 +34,6 @@
* @author Ruud Senden
*/
public abstract class AbstractToolGetCommand extends AbstractOutputCommand implements IJsonNodeSupplier {
private static final ObjectMapper objectMapper = new ObjectMapper();

@Parameters(index = "0", descriptionKey = "fcli.tool.get.version")
private String requestedVersion;
Expand Down Expand Up @@ -63,7 +62,7 @@ public final JsonNode getJsonNode() {
isDefault
);

return objectMapper.valueToTree(outputDescriptor);
return JsonHelper.getObjectMapper().valueToTree(outputDescriptor);
}

@Override
Expand Down
12 changes: 5 additions & 7 deletions ...fcli-tool/src/main/java/com/fortify/cli/tool/_common/cli/cmd/AbstractToolListCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
package com.fortify.cli.tool._common.cli.cmd;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fortify.cli.common.json.JsonHelper;
import com.fortify.cli.common.output.cli.cmd.AbstractOutputCommand;
Expand All @@ -27,16 +26,15 @@
import com.fortify.cli.tool.definitions.helper.ToolDefinitionVersionDescriptor;

public abstract class AbstractToolListCommand extends AbstractOutputCommand implements IJsonNodeSupplier {
private static final ObjectMapper objectMapper = new ObjectMapper();

@Override
public final JsonNode getJsonNode() {
var toolName = getTool().getToolName();
ToolInstallations installations = ToolInstallationsResolver.resolve(getTool());
return installations.stream()
.map(record -> createToolOutputDescriptor(toolName, record))
.map(objectMapper::<ObjectNode>valueToTree)
.collect(JsonHelper.arrayNodeCollector());
ToolInstallations installations = ToolInstallationsResolver.resolve(getTool());
return installations.stream()
.map(record -> createToolOutputDescriptor(toolName, record))
.map(JsonHelper.getObjectMapper()::<ObjectNode>valueToTree)
.collect(JsonHelper.arrayNodeCollector());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...li-tool/src/main/java/com/fortify/cli/tool/_common/helper/ToolInstallationDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public Path getBinPath() {
}

public Path getGlobalBinPath() {
return asPath(binDir);
return asPath(globalBinDir);
}

private static final ToolInstallationDescriptor load(Path descriptorPath) {
Expand Down