From 5559c5ce0156d6f2d749f6cfc64b606cb5fdf919 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Thu, 2 Feb 2017 02:06:38 +0100 Subject: [PATCH] Minor refacto --- .../coursier/maven/MavenRepository.scala | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/core/shared/src/main/scala/coursier/maven/MavenRepository.scala b/core/shared/src/main/scala/coursier/maven/MavenRepository.scala index eaee02d20..71322222c 100644 --- a/core/shared/src/main/scala/coursier/maven/MavenRepository.scala +++ b/core/shared/src/main/scala/coursier/maven/MavenRepository.scala @@ -90,20 +90,29 @@ final case class MavenRepository( val root0 = if (root.endsWith("/")) root else root + "/" val source = MavenSource(root0, changing, sbtAttrStub, authentication) + private def modulePath( + module: Module, + version: String + ): Seq[String] = + module.organization.split('.').toSeq ++ Seq( + dirModuleName(module, sbtAttrStub), + version + ) + + private def urlFor(path: Seq[String]): String = + root0 + path.map(encodeURIComponent).mkString("/") + def projectArtifact( module: Module, version: String, versioningValue: Option[String] ): Artifact = { - val path = module.organization.split('.').toSeq ++ Seq( - dirModuleName(module, sbtAttrStub), - version, + val path = modulePath(module, version) :+ s"${module.name}-${versioningValue getOrElse version}.pom" - ) Artifact( - root0 + path.map(encodeURIComponent).mkString("/"), + urlFor(path), Map.empty, Map.empty, Attributes("pom", ""), @@ -123,7 +132,7 @@ final case class MavenRepository( val artifact = Artifact( - root0 + path.map(encodeURIComponent).mkString("/"), + urlFor(path), Map.empty, Map.empty, Attributes("pom", ""), @@ -141,15 +150,11 @@ final case class MavenRepository( version: String ): Option[Artifact] = { - val path = module.organization.split('.').toSeq ++ Seq( - dirModuleName(module, sbtAttrStub), - version, - "maven-metadata.xml" - ) + val path = modulePath(module, version) :+ "maven-metadata.xml" val artifact = Artifact( - root0 + path.map(encodeURIComponent).mkString("/"), + urlFor(path), Map.empty, Map.empty, Attributes("pom", ""),