Fix Sonar

Author: ComputerDaddyGuy

.github/workflows/create-github-release.yaml

@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up GraalVM
-        uses: graalvm/setup-graalvm@v1
+        uses: graalvm/setup-graalvm@eec48106e0bf45f2976c2ff0c3e22395cced8243
         with:
           java-version: "21"
           distribution: "graalvm"
@@ -130,7 +130,7 @@ jobs:
           echo "body_path=release_notes.tmp" >> $GITHUB_OUTPUT
 
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090
         with:
           name: "JFileTreePrettyPrinter ${{ github.ref_name }}"
           body_path: ${{ steps.changelog.outputs.body_path }}

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/ExternalOptions.java

@@ -8,9 +8,4 @@ record ExternalOptions(
 	@Valid @Nullable ChildLimit childLimit
 ) {
 
-	public ExternalOptions(Boolean emojis, ChildLimit childLimit) {
-		this.emojis = emojis;
-		this.childLimit = childLimit;
-	}
-
 }

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/ExternalOptionsReader.java

@@ -53,61 +53,57 @@ private void printFailure(boolean required, String msg, Object... args) {
 	@Nullable
 	private PrettyPrintOptions tryCandidate(Path optionsPath, boolean required) {
 
-		if (!optionsPath.toFile().exists()) {
+		var optionsFile = optionsPath.toFile();
+		if (!optionsFile.exists()) {
 			printFailure(required, "Options file not found: %s", optionsPath);
 			return null;
 		}
 
-		if (!optionsPath.toFile().isFile()) {
+		if (!optionsFile.isFile()) {
 			printFailure(required, "Options file is actually not a file: %s", optionsPath);
 			return null;
 		}
 
-		if (!optionsPath.toFile().canRead()) {
+		if (!optionsFile.canRead()) {
 			printFailure(required, "Options file exist but is not readable: %s", optionsPath);
 			return null;
 		}
 
 		output.printDebug("Options file found: %s", optionsPath);
 
-		ExternalOptions externalOptions;
+		ExternalOptions externalOptions = load(optionsPath, required);
+		validate(optionsPath, externalOptions, required);
+
+		return mapToOptions(externalOptions);
+	}
+
+	private ExternalOptions load(Path optionsPath, boolean required) {
 		try {
-			externalOptions = loadAndValidate(optionsPath);
-		} catch (ConstraintViolationException e) {
-			printFailure(required, "Invalid options file: %s\n%s", optionsPath, e.getMessage());
-			return null;
+			var mapper = JsonMapper.builder().build();
+			ExternalOptions externalOptions = mapper.readValue(optionsPath, ExternalOptions.class);
+			output.printDebug("%s", RecordUtils.toTextBlock(externalOptions));
+			return externalOptions;
 		} catch (RuntimeException e) {
 			printFailure(required, "IO error or malformed options file: %s\n%s", optionsPath, e.getMessage());
 			return null;
 		}
-
-		return mapToOptions(externalOptions);
 	}
 
-	private ExternalOptions loadAndValidate(Path optionsPath) {
-		/*
-		 * READ
-		 */
-		var mapper = JsonMapper.builder().build();
-		ExternalOptions externalOptions = mapper.readValue(optionsPath, ExternalOptions.class);
-
-		/*
-		 * VALIDATE
-		 */
-		var validatorFactory = Validation.byDefaultProvider()
-			.configure()
-			.messageInterpolator(new ParameterMessageInterpolator())
-			.buildValidatorFactory();
-		var validator = validatorFactory.getValidator();
-
-		var violations = validator.validate(externalOptions);
-		if (!violations.isEmpty()) {
-			throw new ConstraintViolationException(violations);
+	private void validate(Path optionsPath, ExternalOptions externalOptions, boolean required) {
+		try {
+			var validatorFactory = Validation.byDefaultProvider()
+				.configure()
+				.messageInterpolator(new ParameterMessageInterpolator())
+				.buildValidatorFactory();
+			var validator = validatorFactory.getValidator();
+
+			var violations = validator.validate(externalOptions);
+			if (!violations.isEmpty()) {
+				throw new ConstraintViolationException(violations);
+			}
+		} catch (ConstraintViolationException e) {
+			printFailure(required, "Invalid options file: %s\n%s", optionsPath, e.getMessage());
 		}
-
-		output.printDebug("%s", RecordUtils.toTextBlock(externalOptions));
-
-		return externalOptions;
 	}
 
 	private PrettyPrintOptions mapToOptions(ExternalOptions externalOptions) {