scalafmt

on-behalf-of: @e-solutions-GmbH <[email protected]>

Author: JayMandala

src/main/scala/com/github/sbt/sbom/BomExtractor.scala

@@ -274,7 +274,8 @@ class BomExtractor(settings: BomExtractorParams, report: UpdateReport, rootModul
         }
     }
 
-    private def moduleGraph: ModuleGraph = SbtUpdateReport.fromConfigurationReport(configurationReport, rootModuleID, log)
+    private def moduleGraph: ModuleGraph =
+      SbtUpdateReport.fromConfigurationReport(configurationReport, rootModuleID, log)
   }
 
   private def toCycloneDxProjectType(e: ProjectType): Component.Type = {
@@ -312,7 +313,12 @@ class BomExtractor(settings: BomExtractorParams, report: UpdateReport, rootModul
 }
 
 object BomExtractor {
-  private[sbom] def purl(group: String, name: String, version: String, qualifier: Map[String, String] = Map[String, String]()): String = {
+  private[sbom] def purl(
+      group: String,
+      name: String,
+      version: String,
+      qualifier: Map[String, String] = Map[String, String]()
+  ): String = {
     val convertedMap = new TM[String, String](qualifier.asJava)
 
     new PackageURL(PackageURL.StandardTypes.MAVEN, group, name, version, convertedMap, null).canonicalize()

src/main/scala/com/github/sbt/sbom/BomExtractorParams.scala

@@ -20,4 +20,3 @@ final case class BomExtractorParams(
     projectType: ProjectType,
     bomOutputPath: sbt.File
 )
-

src/main/scala/com/github/sbt/sbom/BomSbtPlugin.scala

@@ -109,4 +109,3 @@ object BomSbtPlugin extends AutoPlugin {
     )
   }
 }
-

src/main/scala/com/github/sbt/sbom/BomSbtSettings.scala

@@ -109,4 +109,3 @@ object BomSbtSettings {
     }
 
 }
-

src/main/scala/com/github/sbt/sbom/BomTask.scala

@@ -133,4 +133,3 @@ abstract class BomTask[T](protected val properties: BomTaskProperties) {
 
   protected lazy val bomOutputPath: sbt.File = properties.bomOutputPath
 }
-

src/main/scala/com/github/sbt/sbom/ProjectType.scala

@@ -5,28 +5,43 @@
 package com.github.sbt.sbom
 
 sealed trait ProjectType
-  case object APPLICATION extends ProjectType
-  case object FRAMEWORK extends ProjectType
-  case object LIBRARY extends ProjectType
-  case object CONTAINER extends ProjectType
-  case object PLATFORM extends ProjectType
-  case object OPERATING_SYSTEM extends ProjectType
-  case object DEVICE extends ProjectType
-  case object DEVICE_DRIVER extends ProjectType
-  case object FIRMWARE extends ProjectType
-  case object FILE extends ProjectType
-  case object MACHINE_LEARNING_MODEL extends ProjectType
-  case object DATA extends ProjectType
-  case object CRYPTOGRAPHIC_ASSET extends ProjectType
+case object APPLICATION extends ProjectType
+case object FRAMEWORK extends ProjectType
+case object LIBRARY extends ProjectType
+case object CONTAINER extends ProjectType
+case object PLATFORM extends ProjectType
+case object OPERATING_SYSTEM extends ProjectType
+case object DEVICE extends ProjectType
+case object DEVICE_DRIVER extends ProjectType
+case object FIRMWARE extends ProjectType
+case object FILE extends ProjectType
+case object MACHINE_LEARNING_MODEL extends ProjectType
+case object DATA extends ProjectType
+case object CRYPTOGRAPHIC_ASSET extends ProjectType
 
 object ProjectType {
   def fromString(t: String): ProjectType = {
     val projType = t.trim().toUpperCase().replace("-", "_")
 
-    Vector(APPLICATION, FRAMEWORK, LIBRARY, CONTAINER, PLATFORM, OPERATING_SYSTEM,
-      DEVICE, DEVICE_DRIVER, FIRMWARE, FILE, MACHINE_LEARNING_MODEL, DATA, CRYPTOGRAPHIC_ASSET).find(_.toString == projType)
-      .getOrElse(throw new ClassNotFoundException(
-        s"Given Project Type not found. Refer to ${ProjectType.getClass.getName} or the list of available type.")
+    Vector(
+      APPLICATION,
+      FRAMEWORK,
+      LIBRARY,
+      CONTAINER,
+      PLATFORM,
+      OPERATING_SYSTEM,
+      DEVICE,
+      DEVICE_DRIVER,
+      FIRMWARE,
+      FILE,
+      MACHINE_LEARNING_MODEL,
+      DATA,
+      CRYPTOGRAPHIC_ASSET
+    ).find(_.toString == projType)
+      .getOrElse(
+        throw new ClassNotFoundException(
+          s"Given Project Type not found. Refer to ${ProjectType.getClass.getName} or the list of available type."
+        )
       )
   }
 }

src/main/scala/com/github/sbt/sbom/SbtUpdateReport.scala

@@ -67,25 +67,33 @@ object SbtUpdateReport {
     val qualifier = new mutable.HashMap[String, String]()
 
     // Getting artifact with the same name as module name as purl qualifier
-    val moduleArtifacts = moduleReport.artifacts.filter(ar => {
-      ar._1.name.equals(moduleReport.module.name)
-    }).sortBy { x => (x._1.`type`, x._1.classifier, x._1.hashCode()) }
+    val moduleArtifacts = moduleReport.artifacts
+      .filter(ar => {
+        ar._1.name.equals(moduleReport.module.name)
+      })
+      .sortBy { x => (x._1.`type`, x._1.classifier, x._1.hashCode()) }
 
     moduleArtifacts.size match {
       case 0 => () // ignore empty found artifacts
       case x =>
         if (x > 1 && log.isDefined) {
-          log.foreach(_.warn("Multiple artifacts with the same name as module name are detected. Taking the first artifact match as Purl qualifier."))
+          log.foreach(
+            _.warn(
+              "Multiple artifacts with the same name as module name are detected. Taking the first artifact match as Purl qualifier."
+            )
+          )
         }
         if (moduleArtifacts.head._1.`type`.nonEmpty) {
           // "jar" type will not be shown, since it's the default value of an artifact.
           if (moduleArtifacts.head._1.`type` != "jar") {
             qualifier.put("type", moduleArtifacts.head._1.`type`)
           }
         }
-        moduleArtifacts.head._1.classifier.foreach(classifier => if (classifier.nonEmpty) {
-          qualifier.put("classifier", classifier)
-        })
+        moduleArtifacts.head._1.classifier.foreach(classifier =>
+          if (classifier.nonEmpty) {
+            qualifier.put("classifier", classifier)
+          }
+        )
     }
 
     qualifier.toMap
@@ -122,4 +130,3 @@ object SbtUpdateReport {
     ModuleGraph(root +: nodes, edges.flatten)
   }
 }
-