chore: Fix URL handling regression, improve exceptions

rsenden · rsenden · commit 294f634ac132 · 2026-05-29T17:25:31.000+02:00
diff --git a/.github/instructions/java.instructions.md b/.github/instructions/java.instructions.md
@@ -28,6 +28,9 @@ Always use `headerReplace(name, value)` — never `accept()`, `contentType()`, o
 
 ## Exception Handling
 
+- New/updated code should throw only fcli-domain exceptions (`Fcli*Exception`), module-domain exceptions (for example `Aviator*Exception` in Aviator modules), or picocli exceptions (`ParameterException` and related) when integrating with command parsing.
+- Avoid throwing standard Java runtime exceptions (`IllegalArgumentException`, `IllegalStateException`, `RuntimeException`, and similar) for user-facing or command-flow errors.
+
 | Scenario | Exception |
 |----------|-----------|
 | Invalid/missing user input | `FcliSimpleException` |
diff --git a/fcli-core/fcli-ai-assist/src/main/java/com/fortify/cli/ai_assist/mcp/helper/MCPReflectConfigGenerator.java b/fcli-core/fcli-ai-assist/src/main/java/com/fortify/cli/ai_assist/mcp/helper/MCPReflectConfigGenerator.java
@@ -19,13 +19,15 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.fortify.cli.common.exception.FcliSimpleException;
+
 import io.modelcontextprotocol.spec.McpSchema;
 
 // This class is invoked from /fcli-core/fcli-app/build.gradle
 public class MCPReflectConfigGenerator {
     public static void main(String[] args) throws IOException {
         if ( args.length!=1 ) {
-            throw new IllegalArgumentException("Usage: MCPReflectConfigGenerator <outputfile>");
+            throw new FcliSimpleException("Usage: MCPReflectConfigGenerator <outputfile>");
         }
         new MCPReflectConfigGenerator().generateReflectConfig(Path.of(args[0]));
     }
diff --git a/fcli-core/fcli-ai-assist/src/main/java/com/fortify/cli/ai_assist/mcp/helper/http/MCPServerHttpConfig.java b/fcli-core/fcli-ai-assist/src/main/java/com/fortify/cli/ai_assist/mcp/helper/http/MCPServerHttpConfig.java
@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.concurrent.job.AsyncJobManager;
+import com.fortify.cli.common.exception.FcliBugException;
 import com.fortify.cli.common.exception.FcliSimpleException;
 import com.fortify.cli.common.rest.unirest.config.IConnectionConfig;
 import com.fortify.cli.common.util.DateTimePeriodHelper;
@@ -190,7 +191,7 @@ public Product getProduct() {
     @JsonIgnore
     public List<Path> getResolvedImportPaths() {
         if ( configPath == null ) {
-            throw new IllegalStateException("Config path has not been set; validate() must be called first");
+            throw new FcliBugException("Config path has not been set; validate() must be called first");
         }
         return imports.stream()
                 .map(this::resolveImportPath)
diff --git a/fcli-core/fcli-ai-assist/src/main/java/com/fortify/cli/ai_assist/mcp/helper/http/MCPServerHttpSessionDescriptorResolver.java b/fcli-core/fcli-ai-assist/src/main/java/com/fortify/cli/ai_assist/mcp/helper/http/MCPServerHttpSessionDescriptorResolver.java
@@ -30,6 +30,7 @@
 import com.fortify.cli.common.cli.util.FcliExecutionContext;
 import com.fortify.cli.common.cli.util.FcliExecutionContextHolder;
 import com.fortify.cli.common.cli.util.FcliIsolationScope;
+import com.fortify.cli.common.exception.FcliBugException;
 import com.fortify.cli.common.exception.FcliSimpleException;
 import com.fortify.cli.common.rest.unirest.config.UrlConfig;
 import com.fortify.cli.common.session.helper.ISessionDescriptor;
@@ -163,7 +164,7 @@ private void evictExpiredScopes(long ttlMillis) {
     private FcliIsolationScope getExistingIsolationScope(String authScopeKey) {
         var entry = isolationScopeCache.get(authScopeKey);
         if ( entry == null ) {
-            throw new IllegalStateException("No isolation scope found for auth scope key");
+            throw new FcliBugException("No isolation scope found for auth scope key");
         }
         return entry.scope;
     }
@@ -294,7 +295,7 @@ private MessageDigest getDigest() {
         try {
             return MessageDigest.getInstance("SHA-256");
         } catch ( NoSuchAlgorithmException e ) {
-            throw new IllegalStateException("SHA-256 digest algorithm is not available", e);
+            throw new FcliBugException("SHA-256 digest algorithm is not available", e);
         }
     }
 
diff --git a/fcli-core/fcli-ai-assist/src/main/java/com/fortify/cli/ai_assist/mcp/helper/runner/MCPToolFcliPagedHelper.java b/fcli-core/fcli-ai-assist/src/main/java/com/fortify/cli/ai_assist/mcp/helper/runner/MCPToolFcliPagedHelper.java
@@ -17,6 +17,8 @@
 
 import com.fortify.cli.ai_assist.mcp.helper.MCPJobManager;
 import com.fortify.cli.ai_assist.mcp.helper.arg.MCPToolArgHandlerPaging;
+import com.fortify.cli.common.exception.FcliBugException;
+import com.fortify.cli.common.exception.FcliTechnicalException;
 
 import io.modelcontextprotocol.spec.McpSchema.CallToolRequest;
 import io.modelcontextprotocol.spec.McpSchema.CallToolResult;
@@ -75,10 +77,10 @@ CallToolResult run(String jobId, PageParams pageParams, BackgroundStarter starte
                         return tryGetInProgressResult(jobId, pageParams, starter);
                     } catch (InterruptedException e) {
                         Thread.currentThread().interrupt();
-                        throw new RuntimeException("Interrupted while waiting for records", e);
+                        throw new FcliTechnicalException("Interrupted while waiting for records", e);
                     }
                 })
-                .orElseThrow(() -> new IllegalStateException("No result path succeeded for: " + jobId));
+                .orElseThrow(() -> new FcliBugException("No result path succeeded for: " + jobId));
         } catch (Exception e) {
             log.warn("Paged helper failed jobId='{}' offset={} limit={} error={}",
                 jobId, pageParams.offset, pageParams.limit, e.toString());
diff --git a/fcli-core/fcli-common-action/src/main/java/com/fortify/cli/common/action/cli/cmd/RunBuildTimeFcliAction.java b/fcli-core/fcli-common-action/src/main/java/com/fortify/cli/common/action/cli/cmd/RunBuildTimeFcliAction.java
@@ -26,6 +26,7 @@
 import com.fortify.cli.common.action.runner.processor.ActionCliOptionsProcessor.ActionOptionHelper;
 import com.fortify.cli.common.cli.util.FcliExecutionContextHolder;
 import com.fortify.cli.common.cli.util.SimpleOptionsParser.OptionsParseResult;
+import com.fortify.cli.common.exception.FcliSimpleException;
 import com.fortify.cli.common.progress.helper.ProgressWriterI18n;
 import com.fortify.cli.common.progress.helper.ProgressWriterType;
 
@@ -41,7 +42,7 @@
 public class RunBuildTimeFcliAction {
     public static void main(String[] args) {
         if ( args.length<2 ) {
-            throw new RuntimeException("Usage: RunBuildTimeFcliAction <log file> <action-path> [action args]");
+            throw new FcliSimpleException("Usage: RunBuildTimeFcliAction <log file> <action-path> [action args]");
         }
         try (var progressWriter = new ProgressWriterI18n(ProgressWriterType.simple, null) ) {
             var logFile = args[0];
@@ -88,6 +89,6 @@ private static final RuntimeException onValidationErrors(OptionsParseResult opti
         var errorsString = String.join("\n ", optionsParseResult.getValidationErrors());
         var supportedOptionsString = ActionOptionHelper.getSupportedOptionsTable(optionsParseResult.getOptions());
         var msg = String.format("Option errors:\n %s\nSupported options:\n%s\n", errorsString, supportedOptionsString);
-        return new RuntimeException(msg);
+        return new FcliSimpleException(msg);
     }
 }
diff --git a/fcli-core/fcli-common-action/src/main/java/com/fortify/cli/common/concurrent/job/AsyncJobManager.java b/fcli-core/fcli-common-action/src/main/java/com/fortify/cli/common/concurrent/job/AsyncJobManager.java
@@ -25,6 +25,7 @@
 import com.fortify.cli.common.cli.util.FcliExecutionContext;
 import com.fortify.cli.common.cli.util.FcliExecutionContextHolder;
 import com.fortify.cli.common.cli.util.StdioHelper;
+import com.fortify.cli.common.exception.FcliBugException;
 
 import lombok.Builder;
 import lombok.Data;
@@ -87,11 +88,11 @@ public AsyncJobManager(Config config) {
      */
     public String startBackground(TaskDescriptor descriptor) {
         if ( descriptor == null ) {
-            throw new IllegalArgumentException("TaskDescriptor must be specified");
+            throw new FcliBugException("TaskDescriptor must be specified");
         }
         var task = descriptor.getTask();
         if ( task == null ) {
-            throw new IllegalArgumentException("TaskDescriptor.task must be specified");
+            throw new FcliBugException("TaskDescriptor.task must be specified");
         }
         var jobId = descriptor.getJobId() == null ? UUID.randomUUID().toString() : descriptor.getJobId();
         var listener = descriptor.getListener();
diff --git a/fcli-core/fcli-common-ci/src/main/java/com/fortify/cli/common/ci/CiEnvironmentTestHelper.java b/fcli-core/fcli-common-ci/src/main/java/com/fortify/cli/common/ci/CiEnvironmentTestHelper.java
@@ -23,6 +23,7 @@
 import com.fortify.cli.common.ci.bitbucket.BitbucketEnvironment;
 import com.fortify.cli.common.ci.github.GitHubEnvironment;
 import com.fortify.cli.common.ci.gitlab.GitLabEnvironment;
+import com.fortify.cli.common.exception.FcliBugException;
 
 import lombok.Getter;
 
@@ -81,7 +82,7 @@ private static void collectEnvironmentVariableNames(Class<?> environmentClass, S
                         target.add(value);
                     }
                 } catch ( IllegalAccessException e ) {
-                    throw new IllegalStateException("Unable to access CI environment field "+field.getName(), e);
+                    throw new FcliBugException("Unable to access CI environment field "+field.getName(), e);
                 }
             }
         }
diff --git a/fcli-core/fcli-common-ci/src/main/java/com/fortify/cli/common/ci/gitlab/GitLabProject.java b/fcli-core/fcli-common-ci/src/main/java/com/fortify/cli/common/ci/gitlab/GitLabProject.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.formkiq.graalvm.annotations.Reflectable;
+import com.fortify.cli.common.exception.FcliSimpleException;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.rest.unirest.HttpHeader;
 import com.fortify.cli.common.util.Break;
@@ -97,10 +98,10 @@ public ObjectNode uploadCodeQualityReport(String mergeRequestIid, String reportC
         try {
             var report = JsonHelper.getObjectMapper().readTree(reportContent);
             if (!report.isArray()) {
-                throw new IllegalArgumentException("Code quality report must be a JSON array");
+                throw new FcliSimpleException("Code quality report must be a JSON array");
             }
         } catch (Exception e) {
-            throw new IllegalArgumentException("Invalid JSON in code quality report: " + e.getMessage(), e);
+            throw new FcliSimpleException("Invalid JSON in code quality report: " + e.getMessage(), e);
         }
         
         return unirest
diff --git a/fcli-core/fcli-common-core/src/main/java/com/fortify/cli/common/cli/util/FcliExecutionContextHolder.java b/fcli-core/fcli-common-core/src/main/java/com/fortify/cli/common/cli/util/FcliExecutionContextHolder.java
@@ -15,6 +15,7 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 
+import com.fortify.cli.common.exception.FcliBugException;
 import com.fortify.cli.common.session.helper.ISessionDescriptor;
 
 /**
@@ -95,7 +96,7 @@ public static FcliExecutionContext pop() {
     public static FcliExecutionContext current() { 
         var stack = HOLDER.get();
         if ( stack.isEmpty() ) {
-            throw new IllegalStateException(
+            throw new FcliBugException(
                 "No FcliExecutionContext on the current thread. "
                 + "Ensure a context is pushed at every execution entry point "
                 + "(CLI command, MCP request, RPC request).");
diff --git a/fcli-core/fcli-common-core/src/main/java/com/fortify/cli/common/output/writer/record/impl/RecordWriterTable.java b/fcli-core/fcli-common-core/src/main/java/com/fortify/cli/common/output/writer/record/impl/RecordWriterTable.java
@@ -23,6 +23,7 @@
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fortify.cli.common.exception.FcliTechnicalException;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.output.writer.record.RecordWriterConfig;
 import com.fortify.cli.common.util.ConsoleHelper;
@@ -123,7 +124,7 @@ private void outputSegment(boolean finalSegment) {
                 writer.write('\n');
                 writer.flush();
             } catch ( IOException e ) {
-                throw new RuntimeException("Error writing table segment", e);
+                throw new FcliTechnicalException("Error writing table segment", e);
             }
         }
 
diff --git a/fcli-core/fcli-common-core/src/main/java/com/fortify/cli/common/rest/unirest/RemoteUrlAuthHelper.java b/fcli-core/fcli-common-core/src/main/java/com/fortify/cli/common/rest/unirest/RemoteUrlAuthHelper.java
@@ -30,6 +30,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fortify.cli.common.exception.FcliSimpleException;
 import com.fortify.cli.common.log.LogMaskHelper;
 import com.fortify.cli.common.log.LogMaskSource;
 import com.fortify.cli.common.log.LogSensitivityLevel;
@@ -59,10 +60,8 @@ public static ParsedRemoteUrl parse(String source) throws MalformedURLException
             var uri = url.toURI();
             var headers = parseHeaders(uri.getRawUserInfo());
             return new ParsedRemoteUrl(removeUserInfo(uri), headers);
-        } catch ( URISyntaxException | IllegalArgumentException e ) {
-            var mue = new MalformedURLException("Invalid URL: "+source);
-            mue.initCause(e);
-            throw mue;
+        } catch ( URISyntaxException e ) {
+            throw new FcliSimpleException("Invalid URL: "+source, e);
         }
     }
 
@@ -95,13 +94,17 @@ private static String removeUserInfo(URI uri) throws URISyntaxException {
                 rawAuthority = rawAuthority.substring(atSignIndex + 1);
             }
         }
-        return new URI(
-            uri.getScheme(),
-            rawAuthority,
-            uri.getRawPath(),
-            uri.getRawQuery(),
-            uri.getRawFragment()
-        ).toString();
+        // Build the URI string from raw (already-encoded) components to avoid double-encoding.
+        // The multi-arg URI constructors treat their arguments as decoded and would re-encode
+        // any percent-encoded sequences (e.g. %2B → %252B), breaking URLs that already contain
+        // percent-encoded characters such as Adoptium JRE download URLs (jdk-17.0.9%2B9/...).
+        var sb = new StringBuilder();
+        if ( uri.getScheme() != null ) { sb.append(uri.getScheme()).append(':'); }
+        if ( rawAuthority != null ) { sb.append("//").append(rawAuthority); }
+        if ( uri.getRawPath() != null ) { sb.append(uri.getRawPath()); }
+        if ( uri.getRawQuery() != null ) { sb.append('?').append(uri.getRawQuery()); }
+        if ( uri.getRawFragment() != null ) { sb.append('#').append(uri.getRawFragment()); }
+        return sb.toString();
     }
 
     private static Map<String, String> parseHeaders(String rawUserInfo) {
@@ -135,24 +138,24 @@ private static Map<String, String> parseBasicAuth(String rawUserInfo) {
 
     private static Map<String, String> parseHeaderAssignments(String assignments) {
         if ( StringUtils.isBlank(assignments) ) {
-            throw new IllegalArgumentException("No headers specified in URL userinfo");
+            throw new FcliSimpleException("No headers specified in URL userinfo");
         }
         var result = new LinkedHashMap<String, String>();
         for ( var assignment : assignments.split("&") ) {
             if ( StringUtils.isBlank(assignment) ) { continue; }
             var separatorIndex = assignment.indexOf('=');
             if ( separatorIndex <= 0 ) {
-                throw new IllegalArgumentException("Invalid header assignment in URL userinfo: "+assignment);
+                throw new FcliSimpleException("Invalid header assignment in URL userinfo: "+assignment);
             }
             var name = decode(assignment.substring(0, separatorIndex));
             var value = decode(assignment.substring(separatorIndex + 1));
             if ( StringUtils.isBlank(name) ) {
-                throw new IllegalArgumentException("Header name must not be blank in URL userinfo");
+                throw new FcliSimpleException("Header name must not be blank in URL userinfo");
             }
             result.put(name, value);
         }
         if ( result.isEmpty() ) {
-            throw new IllegalArgumentException("No valid headers specified in URL userinfo");
+            throw new FcliSimpleException("No valid headers specified in URL userinfo");
         }
         return Collections.unmodifiableMap(result);
     }
diff --git a/fcli-core/fcli-common-core/src/main/java/com/fortify/cli/common/rest/unirest/UnirestContext.java b/fcli-core/fcli-common-core/src/main/java/com/fortify/cli/common/rest/unirest/UnirestContext.java
@@ -16,6 +16,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 
+import com.fortify.cli.common.exception.FcliBugException;
 import com.fortify.cli.common.util.JavaHelper;
 
 import kong.unirest.UnirestInstance;
@@ -58,7 +59,7 @@ public String identity() {
      */
     public UnirestInstance getUnirestInstance(String key, Consumer<UnirestInstance> configurer) {
         if (closed) {
-            throw new IllegalStateException("UnirestContext has been closed");
+            throw new FcliBugException("UnirestContext has been closed");
         }
         return cache.computeIfAbsent(key, k -> {
             log.debug("Creating new Unirest instance for key: {} in {}", key, identity());
diff --git a/fcli-core/fcli-common-core/src/main/java/com/fortify/cli/common/rest/unirest/UnirestHelper.java b/fcli-core/fcli-common-core/src/main/java/com/fortify/cli/common/rest/unirest/UnirestHelper.java
@@ -16,6 +16,7 @@
 import java.nio.file.StandardCopyOption;
 import java.util.function.Consumer;
 
+import com.fortify.cli.common.exception.FcliSimpleException;
 import com.fortify.cli.common.http.proxy.helper.ProxyHelper;
 import com.fortify.cli.common.json.JsonHelper;
 
@@ -42,7 +43,7 @@ private static RemoteUrlAuthHelper.ParsedRemoteUrl parseRemoteUrl(String url) {
         try {
             return RemoteUrlAuthHelper.parse(url);
         } catch (Exception e) {
-            throw new IllegalArgumentException("Invalid URL: "+url, e);
+            throw new FcliSimpleException("Invalid URL: "+url, e);
         }
     }
 
diff --git a/fcli-core/fcli-common-core/src/main/java/com/fortify/cli/common/spel/SpelEvaluator.java b/fcli-core/fcli-common-core/src/main/java/com/fortify/cli/common/spel/SpelEvaluator.java
@@ -39,6 +39,7 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.exception.FcliSimpleException;
+import com.fortify.cli.common.exception.FcliTechnicalException;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.spel.fn.SpelFunctionsStandard;
 
@@ -205,7 +206,7 @@ public String convert(JsonNode source) {
             try {
                 return JsonHelper.getObjectMapper().writeValueAsString(source);
             } catch (Exception e) {
-                throw new RuntimeException("Failed to convert JsonNode to String", e);
+                throw new FcliTechnicalException("Failed to convert JsonNode to String", e);
             }
         }
     }
@@ -216,7 +217,7 @@ public String convert(JsonNodeWrapper<?> source) {
             try {
                 return JsonHelper.getObjectMapper().writeValueAsString(source.getRealNode());
             } catch (Exception e) {
-                throw new RuntimeException("Failed to convert JsonNodeWrapper to String", e);
+                throw new FcliTechnicalException("Failed to convert JsonNodeWrapper to String", e);
             }
         }
     }
diff --git a/fcli-core/fcli-common-core/src/test/java/com/fortify/cli/common/cli/util/FcliExecutionContextTest.java b/fcli-core/fcli-common-core/src/test/java/com/fortify/cli/common/cli/util/FcliExecutionContextTest.java
@@ -22,6 +22,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.fortify.cli.common.exception.FcliBugException;
 import com.fortify.cli.common.session.helper.ISessionDescriptor;
 
 class FcliExecutionContextTest {
@@ -97,7 +98,7 @@ void createChildInheritsIsolationScopeAndCreatesFreshActionState() {
     @Test
     void currentThrowsWhenNoContextHasBeenPushed() {
         // Verify that current() never silently creates a context — callers must push explicitly.
-        assertThrows(IllegalStateException.class, FcliExecutionContextHolder::current);
+        assertThrows(FcliBugException.class, FcliExecutionContextHolder::current);
     }
 
     private static final class DummySessionDescriptor implements ISessionDescriptor {
diff --git a/fcli-core/fcli-common-core/src/test/java/com/fortify/cli/common/rest/unirest/RemoteUrlAuthHelperTest.java b/fcli-core/fcli-common-core/src/test/java/com/fortify/cli/common/rest/unirest/RemoteUrlAuthHelperTest.java
@@ -59,6 +59,28 @@ public void testParseCustomHeadersFromUserInfo() throws Exception {
         assertEquals(2, parsed.getHeaders().size());
     }
 
+    @Test
+    public void testParseNoUserInfoPreservesPercentEncodedPath() throws Exception {
+        // Regression test: URLs with percent-encoded characters in the path (e.g. Adoptium JRE
+        // download URLs like .../jdk-17.0.9%2B9/...) must not be double-encoded to %252B.
+        var url = "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz";
+        var parsed = RemoteUrlAuthHelper.parse(url);
+
+        assertEquals(url, parsed.getRequestUrl());
+        assertTrue(parsed.getHeaders().isEmpty());
+    }
+
+    @Test
+    public void testParseUserInfoPreservesPercentEncodedPath() throws Exception {
+        // Regression test: stripping userinfo from URLs with percent-encoded path must not
+        // double-encode those sequences (%2B → %252B).
+        var parsed = RemoteUrlAuthHelper.parse(
+            "https://user:pass@github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/file.tar.gz"
+        );
+
+        assertEquals("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/file.tar.gz", parsed.getRequestUrl());
+    }
+
     @Test
     public void testParseFileUrlUnchanged() throws Exception {
         var parsed = RemoteUrlAuthHelper.parse("file:/tmp/action.yaml");
diff --git a/fcli-core/fcli-common-core/src/test/java/com/fortify/cli/common/rest/unirest/UnirestContextTest.java b/fcli-core/fcli-common-core/src/test/java/com/fortify/cli/common/rest/unirest/UnirestContextTest.java
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/scan/helper/FoDScanHelper.java
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/rpc_server/helper/RPCNotification.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/rpc_server/helper/RPCNotification.java
diff --git a/fcli-other/fcli-doc/src/main/java/com/fortify/cli/common/action/schema/generator/GenerateActionSchema.java b/fcli-other/fcli-doc/src/main/java/com/fortify/cli/common/action/schema/generator/GenerateActionSchema.java

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`import com.fortify.cli.common.cli.util.FcliExecutionContext;`
`31`	`31`	`import com.fortify.cli.common.cli.util.FcliExecutionContextHolder;`
`32`	`32`	`import com.fortify.cli.common.cli.util.FcliIsolationScope;`
	`33`	`+import com.fortify.cli.common.exception.FcliBugException;`
`33`	`34`	`import com.fortify.cli.common.exception.FcliSimpleException;`
`34`	`35`	`import com.fortify.cli.common.rest.unirest.config.UrlConfig;`
`35`	`36`	`import com.fortify.cli.common.session.helper.ISessionDescriptor;`
`@@ -163,7 +164,7 @@ private void evictExpiredScopes(long ttlMillis) {`
`163`	`164`	`private FcliIsolationScope getExistingIsolationScope(String authScopeKey) {`
`164`	`165`	`var entry = isolationScopeCache.get(authScopeKey);`
`165`	`166`	`if ( entry == null ) {`
`166`		`- throw new IllegalStateException("No isolation scope found for auth scope key");`
	`167`	`+ throw new FcliBugException("No isolation scope found for auth scope key");`
`167`	`168`	`}`
`168`	`169`	`return entry.scope;`
`169`	`170`	`}`
`@@ -294,7 +295,7 @@ private MessageDigest getDigest() {`
`294`	`295`	`try {`
`295`	`296`	`return MessageDigest.getInstance("SHA-256");`
`296`	`297`	`} catch ( NoSuchAlgorithmException e ) {`
`297`		`- throw new IllegalStateException("SHA-256 digest algorithm is not available", e);`
	`298`	`+ throw new FcliBugException("SHA-256 digest algorithm is not available", e);`
`298`	`299`	`}`
`299`	`300`	`}`
`300`	`301`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`import com.fortify.cli.common.ci.bitbucket.BitbucketEnvironment;`
`24`	`24`	`import com.fortify.cli.common.ci.github.GitHubEnvironment;`
`25`	`25`	`import com.fortify.cli.common.ci.gitlab.GitLabEnvironment;`
	`26`	`+import com.fortify.cli.common.exception.FcliBugException;`
`26`	`27`
`27`	`28`	`import lombok.Getter;`
`28`	`29`
`@@ -81,7 +82,7 @@ private static void collectEnvironmentVariableNames(Class<?> environmentClass, S`
`81`	`82`	`target.add(value);`
`82`	`83`	`}`
`83`	`84`	`} catch ( IllegalAccessException e ) {`
`84`		`- throw new IllegalStateException("Unable to access CI environment field "+field.getName(), e);`
	`85`	`+ throw new FcliBugException("Unable to access CI environment field "+field.getName(), e);`
`85`	`86`	`}`
`86`	`87`	`}`
`87`	`88`	`}`