Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
<shadedClassifierName>cli</shadedClassifierName>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>dev.sonarcli.cli.SonarCommand</mainClass>
<mainClass>io.github.randomcodespace.sonarpredict.cli.SonarCommand</mainClass>
<manifestEntries>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
Expand Down Expand Up @@ -326,7 +326,7 @@
<shadedClassifierName>daemon</shadedClassifierName>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>dev.sonarcli.daemon.DaemonMain</mainClass>
<mainClass>io.github.randomcodespace.sonarpredict.daemon.DaemonMain</mainClass>
<manifestEntries>
<Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -12,15 +12,15 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.TextNode;

import dev.sonarcli.protocol.Json;
import dev.sonarcli.protocol.MessageCodec;
import dev.sonarcli.protocol.Method;
import dev.sonarcli.protocol.SocketPaths;
import dev.sonarcli.protocol.WireMessage;
import dev.sonarcli.protocol.dto.AnalyzeRequest;
import dev.sonarcli.protocol.dto.AnalyzeResponse;
import dev.sonarcli.protocol.dto.PingResponse;
import dev.sonarcli.protocol.dto.RuleMetadata;
import io.github.randomcodespace.sonarpredict.protocol.Json;
import io.github.randomcodespace.sonarpredict.protocol.MessageCodec;
import io.github.randomcodespace.sonarpredict.protocol.Method;
import io.github.randomcodespace.sonarpredict.protocol.SocketPaths;
import io.github.randomcodespace.sonarpredict.protocol.WireMessage;
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalyzeRequest;
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalyzeResponse;
import io.github.randomcodespace.sonarpredict.protocol.dto.PingResponse;
import io.github.randomcodespace.sonarpredict.protocol.dto.RuleMetadata;

/**
* RPC client for the analysis daemon over its Unix domain socket.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

/**
* The daemon-process lifecycle surface the {@code daemon} command depends on,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

/**
* Thrown when an RPC to the daemon fails: a socket-level failure, a malformed
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

import java.io.IOException;
import java.io.UncheckedIOException;
Expand All @@ -12,9 +12,9 @@
import java.util.List;
import java.util.Objects;

import dev.sonarcli.cli.setup.Manifest;
import dev.sonarcli.cli.setup.RuntimeLayout;
import dev.sonarcli.protocol.SocketPaths;
import io.github.randomcodespace.sonarpredict.cli.setup.Manifest;
import io.github.randomcodespace.sonarpredict.cli.setup.RuntimeLayout;
import io.github.randomcodespace.sonarpredict.protocol.SocketPaths;

/**
* Locates the daemon's runnable fat jar and spawns it as a child JVM, returning
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

import java.util.List;

import dev.sonarcli.protocol.dto.AnalyzeRequest;
import dev.sonarcli.protocol.dto.AnalyzeResponse;
import dev.sonarcli.protocol.dto.PingResponse;
import dev.sonarcli.protocol.dto.RuleMetadata;
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalyzeRequest;
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalyzeResponse;
import io.github.randomcodespace.sonarpredict.protocol.dto.PingResponse;
import io.github.randomcodespace.sonarpredict.protocol.dto.RuleMetadata;

/**
* The RPC surface the CLI commands depend on, so a command can be exercised
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

import java.io.BufferedReader;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

import dev.sonarcli.protocol.dto.Issue;
import io.github.randomcodespace.sonarpredict.protocol.dto.Issue;

/**
* Groups issues by file in a deterministic order — shared by both reporters so
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -8,13 +8,13 @@
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;

import dev.sonarcli.cli.coverage.CoverageReport;
import dev.sonarcli.cli.coverage.FileCoverage;
import dev.sonarcli.protocol.Json;
import dev.sonarcli.protocol.dto.AnalysisWarning;
import dev.sonarcli.protocol.dto.AnalyzeResponse;
import dev.sonarcli.protocol.dto.Issue;
import dev.sonarcli.protocol.dto.RuleMetadata;
import io.github.randomcodespace.sonarpredict.cli.coverage.CoverageReport;
import io.github.randomcodespace.sonarpredict.cli.coverage.FileCoverage;
import io.github.randomcodespace.sonarpredict.protocol.Json;
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalysisWarning;
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalyzeResponse;
import io.github.randomcodespace.sonarpredict.protocol.dto.Issue;
import io.github.randomcodespace.sonarpredict.protocol.dto.RuleMetadata;

/**
* Renders an {@link AnalyzeResponse} as compact, single-line JSON, parseable by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

import java.nio.file.Files;
import java.time.Duration;
import java.util.Objects;

import dev.sonarcli.protocol.SocketPaths;
import io.github.randomcodespace.sonarpredict.protocol.SocketPaths;

/**
* Real {@link DaemonControl}: {@code start} delegates to {@link DaemonLauncher},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

import dev.sonarcli.cli.coverage.CoverageReport;
import dev.sonarcli.protocol.dto.AnalyzeResponse;
import io.github.randomcodespace.sonarpredict.cli.coverage.CoverageReport;
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalyzeResponse;

/**
* Renders an {@link AnalyzeResponse} to a string for display.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

import dev.sonarcli.protocol.dto.RuleMetadata;
import io.github.randomcodespace.sonarpredict.protocol.dto.RuleMetadata;

/**
* An in-memory index of {@link RuleMetadata} keyed by rule key, fetched once
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

import java.util.LinkedHashSet;
import java.util.Locale;
Expand All @@ -8,11 +8,11 @@
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;

import dev.sonarcli.cli.coverage.CoverageReport;
import dev.sonarcli.cli.coverage.FileCoverage;
import dev.sonarcli.protocol.Json;
import dev.sonarcli.protocol.dto.AnalyzeResponse;
import dev.sonarcli.protocol.dto.Issue;
import io.github.randomcodespace.sonarpredict.cli.coverage.CoverageReport;
import io.github.randomcodespace.sonarpredict.cli.coverage.FileCoverage;
import io.github.randomcodespace.sonarpredict.protocol.Json;
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalyzeResponse;
import io.github.randomcodespace.sonarpredict.protocol.dto.Issue;

/**
* Renders an {@link AnalyzeResponse} as a SARIF 2.1.0 log
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

/**
* Issue severity, ordered from most to least severe. Used by the
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

import java.io.PrintWriter;
import java.util.List;
import java.util.Objects;

import dev.sonarcli.protocol.SocketPaths;
import dev.sonarcli.protocol.dto.AnalysisWarning;
import dev.sonarcli.protocol.dto.AnalyzeRequest;
import dev.sonarcli.protocol.dto.AnalyzeResponse;
import dev.sonarcli.protocol.dto.Issue;
import io.github.randomcodespace.sonarpredict.protocol.SocketPaths;
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalysisWarning;

Check warning on line 8 in src/main/java/io/github/randomcodespace/sonarpredict/cli/SonarCommand.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this unused import 'io.github.randomcodespace.sonarpredict.protocol.dto.AnalysisWarning'.

See more on https://sonarcloud.io/project/issues?id=RandomCodeSpace_sonar-predict&issues=AZ5ZFeSocGJh43cgUMxU&open=AZ5ZFeSocGJh43cgUMxU&pullRequest=7
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalyzeRequest;
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalyzeResponse;
import io.github.randomcodespace.sonarpredict.protocol.dto.Issue;

import picocli.CommandLine;
import picocli.CommandLine.Command;
Expand Down Expand Up @@ -74,7 +74,7 @@
SonarCommand.RulesCommand.class,
SonarCommand.InstallHookCommand.class,
SonarCommand.DaemonCommand.class,
dev.sonarcli.cli.setup.SetupCommand.class
io.github.randomcodespace.sonarpredict.cli.setup.SetupCommand.class
})
public final class SonarCommand implements Runnable {

Expand Down Expand Up @@ -161,7 +161,7 @@
CoverageOptions coverageOptions) {
// Import coverage first: a coverage parse failure is a tool error
// (exit 2) and should surface before the daemon is even contacted.
dev.sonarcli.cli.coverage.CoverageReport coverage =
io.github.randomcodespace.sonarpredict.cli.coverage.CoverageReport coverage =
coverageOptions.importReports();

AnalyzeRequest request = new AnalyzeRequest(
Expand Down Expand Up @@ -217,7 +217,7 @@
*/
private static void writeSummary(PrintWriter out, List<Issue> issues,
String target,
dev.sonarcli.cli.coverage.CoverageReport coverage) {
io.github.randomcodespace.sonarpredict.cli.coverage.CoverageReport coverage) {
out.printf("sonar-predictor: %d issues written to %s%n", issues.size(), target);
if (!issues.isEmpty()) {
out.print(" severity: ");
Expand Down Expand Up @@ -251,7 +251,7 @@
for (String key : preferredOrder) {
Long c = counts.remove(key);
if (c != null && c > 0) {
if (sb.length() > 0) sb.append(' ');

Check warning on line 254 in src/main/java/io/github/randomcodespace/sonarpredict/cli/SonarCommand.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use "isEmpty()" to check whether a "StringBuilder" is empty or not.

See more on https://sonarcloud.io/project/issues?id=RandomCodeSpace_sonar-predict&issues=AZ5ZFeSocGJh43cgUMxS&open=AZ5ZFeSocGJh43cgUMxS&pullRequest=7
sb.append(key).append('=').append(c);
}
}
Expand Down Expand Up @@ -291,17 +291,17 @@
* Imports and merges every {@code --coverage} report, or returns
* {@code null} when none was requested.
*
* @throws dev.sonarcli.cli.coverage.CoverageException if a report is
* @throws io.github.randomcodespace.sonarpredict.cli.coverage.CoverageException if a report is
* missing, unrecognized, or malformed (mapped to exit 2)
*/
dev.sonarcli.cli.coverage.CoverageReport importReports() {
io.github.randomcodespace.sonarpredict.cli.coverage.CoverageReport importReports() {
if (reports == null || reports.isEmpty()) {
return null;
}
List<java.nio.file.Path> paths = reports.stream()
.map(p -> java.nio.file.Path.of(p).toAbsolutePath().normalize())
.toList();
return new dev.sonarcli.cli.coverage.CoverageImporter().importReports(paths);
return new io.github.randomcodespace.sonarpredict.cli.coverage.CoverageImporter().importReports(paths);
}
}

Expand Down Expand Up @@ -445,12 +445,12 @@
public Integer call() {
SonarCommand parent = rules.parent;
PrintWriter out = parent.spec.commandLine().getOut();
List<dev.sonarcli.protocol.dto.RuleMetadata> catalog = parent.rpc.ruleCatalog();
List<dev.sonarcli.protocol.dto.RuleMetadata> sorted = catalog.stream()
List<io.github.randomcodespace.sonarpredict.protocol.dto.RuleMetadata> catalog = parent.rpc.ruleCatalog();
List<io.github.randomcodespace.sonarpredict.protocol.dto.RuleMetadata> sorted = catalog.stream()
.sorted(java.util.Comparator.comparing(
dev.sonarcli.protocol.dto.RuleMetadata::ruleKey))
io.github.randomcodespace.sonarpredict.protocol.dto.RuleMetadata::ruleKey))
.toList();
for (dev.sonarcli.protocol.dto.RuleMetadata rule : sorted) {
for (io.github.randomcodespace.sonarpredict.protocol.dto.RuleMetadata rule : sorted) {
out.println(rule.ruleKey() + " " + rule.name());
}
out.println();
Expand All @@ -476,7 +476,7 @@
SonarCommand parent = rules.parent;
PrintWriter out = parent.spec.commandLine().getOut();
// An unknown key throws DaemonException -> mapped to exit 2.
dev.sonarcli.protocol.dto.RuleMetadata rule = parent.rpc.ruleMetadata(ruleKey);
io.github.randomcodespace.sonarpredict.protocol.dto.RuleMetadata rule = parent.rpc.ruleMetadata(ruleKey);
out.println("rule: " + rule.ruleKey());
out.println("name: " + rule.name());
out.println("language: " + rule.language());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package dev.sonarcli.cli;
package io.github.randomcodespace.sonarpredict.cli;

import java.util.List;
import java.util.Locale;
import java.util.Map;

import dev.sonarcli.cli.coverage.CoverageReport;
import dev.sonarcli.cli.coverage.FileCoverage;
import dev.sonarcli.protocol.dto.AnalysisWarning;
import dev.sonarcli.protocol.dto.AnalyzeResponse;
import dev.sonarcli.protocol.dto.Issue;
import dev.sonarcli.protocol.dto.RuleMetadata;
import io.github.randomcodespace.sonarpredict.cli.coverage.CoverageReport;
import io.github.randomcodespace.sonarpredict.cli.coverage.FileCoverage;
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalysisWarning;
import io.github.randomcodespace.sonarpredict.protocol.dto.AnalyzeResponse;
import io.github.randomcodespace.sonarpredict.protocol.dto.Issue;
import io.github.randomcodespace.sonarpredict.protocol.dto.RuleMetadata;

/**
* Renders an {@link AnalyzeResponse} as a human-readable report: issues grouped
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli.coverage;
package io.github.randomcodespace.sonarpredict.cli.coverage;

import java.nio.file.Path;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli.coverage;
package io.github.randomcodespace.sonarpredict.cli.coverage;

import java.nio.file.Path;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli.coverage;
package io.github.randomcodespace.sonarpredict.cli.coverage;

/**
* Raised when a coverage report cannot be detected, read, or parsed. The CLI
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli.coverage;
package io.github.randomcodespace.sonarpredict.cli.coverage;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli.coverage;
package io.github.randomcodespace.sonarpredict.cli.coverage;

import java.nio.file.Path;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli.coverage;
package io.github.randomcodespace.sonarpredict.cli.coverage;

import java.nio.file.Path;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli.coverage;
package io.github.randomcodespace.sonarpredict.cli.coverage;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli.coverage;
package io.github.randomcodespace.sonarpredict.cli.coverage;

import java.io.IOException;
import java.io.InputStream;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli.coverage;
package io.github.randomcodespace.sonarpredict.cli.coverage;

import java.util.NavigableSet;
import java.util.TreeSet;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli.coverage;
package io.github.randomcodespace.sonarpredict.cli.coverage;

import java.io.IOException;
import java.nio.file.Files;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.sonarcli.cli.coverage;
package io.github.randomcodespace.sonarpredict.cli.coverage;

import java.nio.file.Path;
import java.util.ArrayList;
Expand Down Expand Up @@ -40,7 +40,7 @@
String name = sourcefile.getAttribute("name");
String filePath = pkgName == null || pkgName.isBlank()
? name
: pkgName + "/" + name;

Check warning on line 43 in src/main/java/io/github/randomcodespace/sonarpredict/cli/coverage/JacocoCoverageParser.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this hard-coded path-delimiter.

See more on https://sonarcloud.io/project/issues?id=RandomCodeSpace_sonar-predict&issues=AZ5ZFeSRcGJh43cgUMxP&open=AZ5ZFeSRcGJh43cgUMxP&pullRequest=7
files.add(coverage(filePath, sourcefile));
}
}
Expand Down
Loading
Loading