Skip to content
Open
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
6 changes: 3 additions & 3 deletions src/main/java/com/jfrog/ide/common/ci/CiManagerBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ public CiManagerBase(Path cachePath, String projectName, Log log, ServerConfig s

/**
* Build the CI tree in a producer-consumer method.
* The producer download build-info artifacts from artifactory, save them in cache and produce the build
* The producer downloads build-info artifacts from Artifactory, saves them in cache and produces the build
* general info to the consumer.
* The consumer download build scan results from Xray, save them in cache and populate the CI tree with nodes
* The consumer downloads build scan results from Xray, saves them in cache and populates the CI tree with nodes
* containing only the build general info of the builds.
* <p>
* When the produce-consumer job is done, the CI tree contains only general information on the builds.
* When the producer-consumer job is done, the CI tree contains only general information on the builds.
* The build dependencies, artifacts and Xray scan results is stored in cache to save RAM.
*
* @param buildsPattern - The build pattern configured in the IDE configuration
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/jfrog/ide/common/npm/NpmTreeBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public DepTree buildTree(Log logger) throws IOException {
}
JsonNode prodResults = npmList(Lists.newArrayList("--prod", "--package-lock-only"));
if (prodResults.get("problems") != null) {
logger.warn("Errors occurred during building the Npm dependency tree. " +
logger.warn("Errors occurred while building the Npm dependency tree. " +
"The dependency tree may be incomplete:\n" + prodResults.get("problems").toString());
}
JsonNode devResults = npmList(Lists.newArrayList("--dev", "--package-lock-only"));
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/jfrog/ide/common/utils/PackageFileFinder.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public PackageFileFinder(Set<Path> projectPaths, Path basePath, String excludedP
}

/**
* Get package.json directories and their directories.
* Get package.json files and their parent directories.
*
* @return Set of package.json's parent directories.
*/
Expand All @@ -60,7 +60,7 @@ public Set<String> getNpmPackagesFilePairs() {
}

/**
* Get package.json directories and their directories.
* Get yarn.lock files and their parent directories.
*
* @return Set of yarn.lock's parent directories.
*/
Expand All @@ -69,7 +69,7 @@ public Set<String> getYarnPackagesFilePairs() {
}

/**
* Get build.gradle and build.gradle.kts directories and their directories.
* Get build.gradle and build.gradle.kts files and their parent directories.
*
* @return Set of build.gradle and build.gradle.kts's parent directories.
*/
Expand All @@ -78,7 +78,7 @@ public Set<String> getBuildGradlePackagesFilePairs() {
}

/**
* Get go.mod directories and their directories.
* Get go.mod files and their parent directories.
*
* @return Set of go.mod's parent directories.
*/
Expand All @@ -100,7 +100,7 @@ Set<Path> getExcludedDirectories() {
*
* @param dir - Current directory.
* @param attrs - Directory attributes.
* @return FileVisitResult.CONTINUE or FileVisitResult.SKIP_SUBTREE respectfully.
* @return FileVisitResult.CONTINUE or FileVisitResult.SKIP_SUBTREE respectively.
*/
@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
Expand Down Expand Up @@ -140,11 +140,11 @@ public FileVisitResult visitFileFailed(Path file, IOException exc) {
}

/**
* Skip sub directories without permissions
* Skip subdirectories without permissions
*
* @param dir - Current directory.
* @param exc - IOException or null.
* @return FileVisitResult.CONTINUE or FileVisitResult.SKIP_SUBTREE respectfully.
* @return FileVisitResult.CONTINUE or FileVisitResult.SKIP_SUBTREE respectively.
*/
@Override
public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
Expand Down
Loading