refactor(node)!: Also move Npm into its own dedicated directory

Establish consistency and prepare for an upcoming refactoring of `Npm` which will add further classes under the `npm` directory. Signed-off-by: Frank Viernau <frank_viernau@epam.com>
oss-review-toolkit · Nov 6, 2024 · 31592d4 · 31592d4
1 parent 5e1d04e
commit 31592d4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/...ers/node/src/funTest/kotlin/NpmFunTest.kt → ...node/src/funTest/kotlin/npm/NpmFunTest.kt b/...ers/node/src/funTest/kotlin/NpmFunTest.kt → ...node/src/funTest/kotlin/npm/NpmFunTest.kt
@@ -17,7 +17,7 @@
  * License-Filename: LICENSE
  */
 
-package org.ossreviewtoolkit.plugins.packagemanagers.node
+package org.ossreviewtoolkit.plugins.packagemanagers.node.npm
 
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.engine.spec.tempdir

diff --git a/...kage-managers/node/src/main/kotlin/Npm.kt → ...-managers/node/src/main/kotlin/npm/Npm.kt b/...kage-managers/node/src/main/kotlin/Npm.kt → ...-managers/node/src/main/kotlin/npm/Npm.kt
@@ -19,7 +19,7 @@
 
 @file:Suppress("TooManyFunctions")
 
-package org.ossreviewtoolkit.plugins.packagemanagers.node
+package org.ossreviewtoolkit.plugins.packagemanagers.node.npm
 
 import java.io.File
 
@@ -29,6 +29,7 @@ import org.ossreviewtoolkit.analyzer.AbstractPackageManagerFactory
 import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
 import org.ossreviewtoolkit.model.config.PackageManagerConfiguration
 import org.ossreviewtoolkit.model.config.RepositoryConfiguration
+import org.ossreviewtoolkit.plugins.packagemanagers.node.PackageJson
 import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.NodePackageManager
 import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.NpmDetection
 import org.ossreviewtoolkit.plugins.packagemanagers.node.yarn.Yarn
@@ -94,7 +95,7 @@ class Npm(
         return runCatching {
             val process = run(workingDir, "info", "--json", packageName)
 
-            parsePackageJson(process.stdout)
+            org.ossreviewtoolkit.plugins.packagemanagers.node.parsePackageJson(process.stdout)
         }.onFailure { e ->
             logger.warn { "Error getting details for $packageName in directory $workingDir: ${e.message.orEmpty()}" }
         }.onSuccess {

diff --git a/plugins/package-managers/node/src/main/kotlin/utils/NpmSupport.kt b/plugins/package-managers/node/src/main/kotlin/utils/NpmSupport.kt
@@ -36,8 +36,8 @@ import org.ossreviewtoolkit.model.Project
 import org.ossreviewtoolkit.model.RemoteArtifact
 import org.ossreviewtoolkit.model.VcsInfo
 import org.ossreviewtoolkit.model.VcsType
-import org.ossreviewtoolkit.plugins.packagemanagers.node.Npm
 import org.ossreviewtoolkit.plugins.packagemanagers.node.PackageJson
+import org.ossreviewtoolkit.plugins.packagemanagers.node.npm.Npm
 import org.ossreviewtoolkit.plugins.packagemanagers.node.parsePackageJson
 import org.ossreviewtoolkit.utils.common.realFile
 import org.ossreviewtoolkit.utils.common.toUri

diff --git a/plugins/package-managers/node/src/main/kotlin/yarn/Yarn.kt b/plugins/package-managers/node/src/main/kotlin/yarn/Yarn.kt
@@ -51,7 +51,7 @@ import org.ossreviewtoolkit.model.createAndLogIssue
 import org.ossreviewtoolkit.model.readTree
 import org.ossreviewtoolkit.model.utils.DependencyGraphBuilder
 import org.ossreviewtoolkit.plugins.packagemanagers.node.PackageJson
-import org.ossreviewtoolkit.plugins.packagemanagers.node.groupLines
+import org.ossreviewtoolkit.plugins.packagemanagers.node.npm.groupLines
 import org.ossreviewtoolkit.plugins.packagemanagers.node.parsePackageJson
 import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.NodePackageManager
 import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.NpmDetection

diff --git a/.../src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory b/.../src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory
@@ -1,4 +1,4 @@
-org.ossreviewtoolkit.plugins.packagemanagers.node.Npm$Factory
+org.ossreviewtoolkit.plugins.packagemanagers.node.npm.Npm$Factory
 org.ossreviewtoolkit.plugins.packagemanagers.node.pnpm.Pnpm$Factory
 org.ossreviewtoolkit.plugins.packagemanagers.node.yarn.Yarn$Factory
 org.ossreviewtoolkit.plugins.packagemanagers.node.yarn2.Yarn2$Factory
diff --git a/...-managers/node/src/test/kotlin/NpmTest.kt → ...agers/node/src/test/kotlin/npm/NpmTest.kt b/...-managers/node/src/test/kotlin/NpmTest.kt → ...agers/node/src/test/kotlin/npm/NpmTest.kt
@@ -17,7 +17,7 @@
  * License-Filename: LICENSE
  */
 
-package org.ossreviewtoolkit.plugins.packagemanagers.node
+package org.ossreviewtoolkit.plugins.packagemanagers.node.npm
 
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.engine.spec.tempdir

diff --git a/plugins/package-managers/node/src/test/kotlin/utils/NpmDependencyHandlerTest.kt b/plugins/package-managers/node/src/test/kotlin/utils/NpmDependencyHandlerTest.kt
@@ -31,7 +31,7 @@ import org.ossreviewtoolkit.model.Identifier
 import org.ossreviewtoolkit.model.PackageLinkage
 import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
 import org.ossreviewtoolkit.model.config.RepositoryConfiguration
-import org.ossreviewtoolkit.plugins.packagemanagers.node.Npm
+import org.ossreviewtoolkit.plugins.packagemanagers.node.npm.Npm
 import org.ossreviewtoolkit.plugins.packagemanagers.node.yarn.NpmModuleInfo
 import org.ossreviewtoolkit.plugins.packagemanagers.node.yarn.YarnDependencyHandler
 import org.ossreviewtoolkit.utils.test.USER_DIR