🎨 improve format of the code

noyshabtay · Nov 26, 2023 · 3e8c4de · 3e8c4de
1 parent cacfe9f
commit 3e8c4de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/main/java/com/jfrog/ide/common/yarn/YarnTreeBuilder.java b/src/main/java/com/jfrog/ide/common/yarn/YarnTreeBuilder.java
@@ -93,7 +93,7 @@ private void addDepTreeNodes(Map<String, DepTreeNode> nodes, JsonNode jsonDep, D
     private boolean isDirectDependency(String rawDependency) {
         rawDependency = StringUtils.lowerCase(rawDependency); // The word specified can be in upper or lower case
         // If rawDependency contains "specified in" or "workspace-aggregator-" it is a direct dependency
-        return StringUtils.contains(rawDependency, "specified in") || StringUtils.contains(rawDependency, "workspace-aggregator-");
+        return StringUtils.containsAny(rawDependency, "specified in", "workspace-aggregator-");
     }
 
     /**

diff --git a/src/test/java/com/jfrog/ide/common/yarn/YarnDriverTest.java b/src/test/java/com/jfrog/ide/common/yarn/YarnDriverTest.java
@@ -16,12 +16,12 @@
 import static org.testng.Assert.*;
 
 /**
- * Test the 'why' functionality in YarnDriver.
+ * Test functionalities of YarnDriver.
  */
 public class YarnDriverTest {
     private static final Path YARN_ROOT = Paths.get(".").toAbsolutePath().normalize().resolve(Paths.get("src", "test", "resources", "yarn"));
 
-    enum Project {
+    public enum Project {
 
         EMPTY("empty"),
         DEPENDENCY("dependency");

diff --git a/src/test/java/com/jfrog/ide/common/yarn/YarnTreeBuilderTest.java b/src/test/java/com/jfrog/ide/common/yarn/YarnTreeBuilderTest.java
@@ -29,7 +29,7 @@
 public class YarnTreeBuilderTest {
     private static final Path YARN_ROOT = Paths.get(".").toAbsolutePath().normalize().resolve(Paths.get("src", "test", "resources", "yarn"));
 
-    enum Project {
+    public enum Project {
         EMPTY("package-name1", "empty"),
         DEPENDENCY("package-name2", "dependency"),
         EXAMPLE("example-yarn-package", "exampleYarnPackage");
@@ -144,15 +144,13 @@ public void extractMultiplePathsTest() {
                 List.of(projectRootId, packageFullName)
         );
         YarnTreeBuilder yarnTreeBuilder = new YarnTreeBuilder(Paths.get(""), "", null, new NullLog());
-        List<List<String>> paths = yarnTreeBuilder.extractMultiplePaths(projectRootId, packageFullName, rawDependencyPaths);
+        List<List<String>> actualPaths = yarnTreeBuilder.extractMultiplePaths(projectRootId, packageFullName, rawDependencyPaths);
 
-        assertNotNull(paths);
-        assertEquals(paths.size(), expectedPaths.size());
-        for (List<String> path : paths) {
+        assertNotNull(actualPaths);
+        assertEquals(actualPaths.size(), expectedPaths.size());
+        for (List<String> path : actualPaths) {
             assertTrue(expectedPaths.contains(path));
         }
-
-
     }
 
     @DataProvider