refactor(helper-cli): Conistently use internal visibility for commands

fviernau · fviernau · commit 8d55dda2513d · 2023-06-02T15:22:27.000+02:00
Signed-off-by: Frank Viernau &lt;frank_viernau@epam.com&gt;
diff --git a/helper-cli/src/main/kotlin/commands/ConvertOrtFileCommand.kt b/helper-cli/src/main/kotlin/commands/ConvertOrtFileCommand.kt
@@ -29,7 +29,7 @@ import org.ossreviewtoolkit.helper.utils.readOrtResult
 import org.ossreviewtoolkit.helper.utils.writeOrtResult
 import org.ossreviewtoolkit.utils.common.expandTilde
 
-class ConvertOrtFileCommand : CliktCommand(
+internal class ConvertOrtFileCommand : CliktCommand(
     help = "Converts the given ORT file to a different format, e.g. '.json' to '.yml'."
 ) {
     private val inputOrtFile by option(
diff --git a/helper-cli/src/main/kotlin/commands/DownloadResultsFromPostgresCommand.kt b/helper-cli/src/main/kotlin/commands/DownloadResultsFromPostgresCommand.kt
@@ -43,7 +43,7 @@ import org.ossreviewtoolkit.utils.common.expandTilde
 import org.ossreviewtoolkit.utils.ort.ORT_CONFIG_FILENAME
 import org.ossreviewtoolkit.utils.ort.ortConfigDirectory
 
-class DownloadResultsFromPostgresCommand : CliktCommand(
+internal class DownloadResultsFromPostgresCommand : CliktCommand(
     name = "download-results-from-postgres",
     help = "Download an ORT result from a PostgreSQL database. The symmetric command to ORT's " +
             " upload-result-to-postgres command."
diff --git a/helper-cli/src/main/kotlin/commands/ExtractRepositoryConfigurationCommand.kt b/helper-cli/src/main/kotlin/commands/ExtractRepositoryConfigurationCommand.kt
@@ -29,7 +29,7 @@ import org.ossreviewtoolkit.helper.utils.readOrtResult
 import org.ossreviewtoolkit.helper.utils.write
 import org.ossreviewtoolkit.utils.common.expandTilde
 
-class ExtractRepositoryConfigurationCommand : CliktCommand(
+internal class ExtractRepositoryConfigurationCommand : CliktCommand(
     help = "Extract the repository configuration from the given ORT result file."
 ) {
     private val ortFile by option(
diff --git a/helper-cli/src/main/kotlin/commands/GetPackageLicensesCommand.kt b/helper-cli/src/main/kotlin/commands/GetPackageLicensesCommand.kt
@@ -42,7 +42,7 @@ import org.ossreviewtoolkit.utils.ort.ortConfigDirectory
 import org.ossreviewtoolkit.utils.spdx.SpdxConstants
 import org.ossreviewtoolkit.utils.spdx.SpdxExpression
 
-class GetPackageLicensesCommand : CliktCommand(
+internal class GetPackageLicensesCommand : CliktCommand(
     help = "Shows the root license and the detected license for a package denoted by the given package identifier."
 ) {
     private val configFile by option(
diff --git a/helper-cli/src/main/kotlin/commands/ListLicenseCategoriesCommand.kt b/helper-cli/src/main/kotlin/commands/ListLicenseCategoriesCommand.kt
@@ -31,7 +31,7 @@ import org.ossreviewtoolkit.model.licenses.LicenseClassifications
 import org.ossreviewtoolkit.model.readValue
 import org.ossreviewtoolkit.utils.common.expandTilde
 
-class ListLicenseCategoriesCommand : CliktCommand(
+internal class ListLicenseCategoriesCommand : CliktCommand(
     help = "Lists the license categories."
 ) {
     private val licenseClassificationsFile by option(
diff --git a/helper-cli/src/main/kotlin/commands/ListPackagesCommand.kt b/helper-cli/src/main/kotlin/commands/ListPackagesCommand.kt
@@ -39,7 +39,7 @@ import org.ossreviewtoolkit.model.licenses.LicenseView
 import org.ossreviewtoolkit.model.utils.createLicenseInfoResolver
 import org.ossreviewtoolkit.utils.common.expandTilde
 
-class ListPackagesCommand : CliktCommand(
+internal class ListPackagesCommand : CliktCommand(
     help = "Lists the packages and optionally also projects contained in the given ORT result file."
 ) {
     private val ortFile by option(
diff --git a/helper-cli/src/main/kotlin/commands/SetDependencyRepresentationCommand.kt b/helper-cli/src/main/kotlin/commands/SetDependencyRepresentationCommand.kt
@@ -54,7 +54,7 @@ import org.ossreviewtoolkit.utils.common.expandTilde
  * files can contain placeholders, which make them invalid (e.g. a placeholder for a numeric value causes serialization
  * to fail). Therefore, a special mode can be enabled, in which well-known placeholders are handled.
  */
-class SetDependencyRepresentationCommand : CliktCommand(
+internal class SetDependencyRepresentationCommand : CliktCommand(
     help = "Set the dependency representation of an ORT result to a specific target format."
 ) {
     /**
diff --git a/helper-cli/src/main/kotlin/commands/TransformResultCommand.kt b/helper-cli/src/main/kotlin/commands/TransformResultCommand.kt
@@ -36,7 +36,7 @@ import org.ossreviewtoolkit.utils.common.expandTilde
  *
  * See https://github.com/schibsted/jslt.
  */
-class TransformResultCommand : CliktCommand(
+internal class TransformResultCommand : CliktCommand(
     name = "transform", help = "Implements a JSLT transformation on the given ORT result file."
 ) {
     private val ortFile by option(
diff --git a/helper-cli/src/main/kotlin/commands/classifications/LicenseClassificationsCommand.kt b/helper-cli/src/main/kotlin/commands/classifications/LicenseClassificationsCommand.kt
@@ -24,7 +24,7 @@ import com.github.ajalt.clikt.core.subcommands
 
 import org.ossreviewtoolkit.model.licenses.LicenseClassifications
 
-class LicenseClassificationsCommand : NoOpCliktCommand(
+internal class LicenseClassificationsCommand : NoOpCliktCommand(
     help = "Commands for working with license classifications."
 ) {
     init {
diff --git a/helper-cli/src/main/kotlin/commands/packageconfig/ExportPathExcludesCommand.kt b/helper-cli/src/main/kotlin/commands/packageconfig/ExportPathExcludesCommand.kt
@@ -38,7 +38,7 @@ import org.ossreviewtoolkit.model.config.PackageConfiguration
 import org.ossreviewtoolkit.model.readValue
 import org.ossreviewtoolkit.utils.common.expandTilde
 
-class ExportPathExcludesCommand : CliktCommand(
+internal class ExportPathExcludesCommand : CliktCommand(
     help = "Export the path excludes to a path excludes file which maps repository URLs to the path excludes for the " +
             "respective repository"
 ) {
diff --git a/helper-cli/src/main/kotlin/commands/packageconfig/ImportLicenseFindingCurationsCommand.kt b/helper-cli/src/main/kotlin/commands/packageconfig/ImportLicenseFindingCurationsCommand.kt
@@ -40,7 +40,7 @@ import org.ossreviewtoolkit.model.readValue
 import org.ossreviewtoolkit.model.utils.FindingCurationMatcher
 import org.ossreviewtoolkit.utils.common.expandTilde
 
-class ImportLicenseFindingCurationsCommand : CliktCommand(
+internal class ImportLicenseFindingCurationsCommand : CliktCommand(
     help = "Import license finding curations from a license finding curations file and merge them into the given "
             + "package configuration."
 ) {
diff --git a/helper-cli/src/main/kotlin/commands/packageconfig/ImportPathExcludesCommand.kt b/helper-cli/src/main/kotlin/commands/packageconfig/ImportPathExcludesCommand.kt
@@ -38,7 +38,7 @@ import org.ossreviewtoolkit.model.config.PackageConfiguration
 import org.ossreviewtoolkit.model.readValue
 import org.ossreviewtoolkit.utils.common.expandTilde
 
-class ImportPathExcludesCommand : CliktCommand(
+internal class ImportPathExcludesCommand : CliktCommand(
     help = "Import path excludes by repository from a file into the given package configuration."
 ) {
     private val pathExcludesFile by option(
diff --git a/helper-cli/src/main/kotlin/commands/packagecuration/SetCommand.kt b/helper-cli/src/main/kotlin/commands/packagecuration/SetCommand.kt
@@ -33,7 +33,7 @@ import org.ossreviewtoolkit.plugins.packagecurationproviders.api.SimplePackageCu
 import org.ossreviewtoolkit.plugins.packagecurationproviders.file.FilePackageCurationProvider
 import org.ossreviewtoolkit.utils.common.expandTilde
 
-class SetCommand : CliktCommand(
+internal class SetCommand : CliktCommand(
     help = "(Re-)set all package curations for a given ORT file to the curations specified via package curations " +
             "file and directory. If no curations are given then all curations get removed."
 ) {
diff --git a/helper-cli/src/main/kotlin/commands/repoconfig/RepositoryConfigurationCommand.kt b/helper-cli/src/main/kotlin/commands/repoconfig/RepositoryConfigurationCommand.kt
@@ -22,7 +22,7 @@ package org.ossreviewtoolkit.helper.commands.repoconfig
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
 
-class RepositoryConfigurationCommand : NoOpCliktCommand(
+internal class RepositoryConfigurationCommand : NoOpCliktCommand(
     help = "Commands for working with package configurations."
 ) {
     init {
diff --git a/helper-cli/src/main/kotlin/commands/scanstorage/ScanStorageCommand.kt b/helper-cli/src/main/kotlin/commands/scanstorage/ScanStorageCommand.kt
@@ -22,7 +22,7 @@ package org.ossreviewtoolkit.helper.commands.scanstorage
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.subcommands
 
-class ScanStorageCommand : NoOpCliktCommand(
+internal class ScanStorageCommand : NoOpCliktCommand(
     help = "Commands for working with scan storages."
 ) {
     init {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import org.ossreviewtoolkit.utils.common.expandTilde`
`36`	`36`	`*`
`37`	`37`	`* See https://github.com/schibsted/jslt.`
`38`	`38`	`*/`
`39`		`-class TransformResultCommand : CliktCommand(`
	`39`	`+internal class TransformResultCommand : CliktCommand(`
`40`	`40`	`name = "transform", help = "Implements a JSLT transformation on the given ORT result file."`
`41`	`41`	`) {`
`42`	`42`	`private val ortFile by option(`