Use 'dotted' convention for maven properties (#414)

lightbend · Feb 18, 2020 · accfaa4 · accfaa4
1 parent 02380eb
commit accfaa4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/core/src/main/scala/com/lightbend/paradox/markdown/Directive.scala b/core/src/main/scala/com/lightbend/paradox/markdown/Directive.scala
@@ -770,7 +770,7 @@ case class DependencyDirective(ctx: Writer.Context) extends LeafBlockDirective("
 
     def mvn(group: String, artifact: String, version: String, scope: Option[String], classifier: Option[String]): String = {
       val elements =
-        Seq("groupId" -> group, "artifactId" -> artifact, "version" -> { if (symbols.contains(version)) s"$${$version}" else version }) ++
+        Seq("groupId" -> group, "artifactId" -> artifact, "version" -> { if (symbols.contains(version)) s"$${${dotted(version)}}" else version }) ++
           classifier.map("classifier" -> _) ++ scope.map("scope" -> _)
       elements.map {
         case (element, value) => s"  <$element>$value</$element>"
@@ -825,7 +825,7 @@ case class DependencyDirective(ctx: Writer.Context) extends LeafBlockDirective("
         case "maven" | "Maven" | "mvn" =>
           val symbolProperties = if (symbols.isEmpty) "" else
             symbolPostfixes.map { sp =>
-              val symb = s"""${requiredCoordinate(VersionSymbol + sp)}"""
+              val symb = s"""${dotted(requiredCoordinate(VersionSymbol + sp))}"""
               s"""  &lt;$symb&gt;${requiredCoordinate(VersionValue + sp)}&lt;/$symb&gt;"""
             }.mkString("&lt;properties&gt;\n", "\n", "\n&lt;/properties&gt;\n")
           val artifacts = dependencyPostfixes.map { dp =>
@@ -848,6 +848,8 @@ case class DependencyDirective(ctx: Writer.Context) extends LeafBlockDirective("
     }
     printer.print("""</dl>""")
   }
+
+  def dotted(symbol: String): String = symbol.replaceAll("(.)([A-Z])", "$1.$2").toLowerCase
 }
 
 case class IncludeDirective(ctx: Writer.Context) extends LeafBlockDirective("include") with SourceDirective {

diff --git a/tests/src/test/scala/com/lightbend/paradox/markdown/DependencyDirectiveSpec.scala b/tests/src/test/scala/com/lightbend/paradox/markdown/DependencyDirectiveSpec.scala
@@ -254,12 +254,12 @@ class DependencyDirectiveSpec extends MarkdownBaseSpec {
       |<pre class="prettyprint">
       |<code class="language-xml">
       |&lt;properties&gt;
-      |  &lt;AkkaHttpVersion&gt;10.1.0&lt;/AkkaHttpVersion&gt;
+      |  &lt;akka.http.version&gt;10.1.0&lt;/akka.http.version&gt;
       |&lt;/properties&gt;
       |&lt;dependency&gt;
       |  &lt;groupId&gt;com.typesafe.akka&lt;/groupId&gt;
       |  &lt;artifactId&gt;akka-http_2.12&lt;/artifactId&gt;
-      |  &lt;version&gt;$${AkkaHttpVersion}&lt;/version&gt;
+      |  &lt;version&gt;$${akka.http.version}&lt;/version&gt;
       |&lt;/dependency&gt;</code></pre>
       |</dd>
       |<dt>gradle</dt>
@@ -308,18 +308,18 @@ class DependencyDirectiveSpec extends MarkdownBaseSpec {
       |<pre class="prettyprint">
       |<code class="language-xml">
       |&lt;properties&gt;
-      |  &lt;AkkaVersion&gt;2.5.29&lt;/AkkaVersion&gt;
-      |  &lt;AkkaHttpVersion&gt;10.1.0&lt;/AkkaHttpVersion&gt;
+      |  &lt;akka.version&gt;2.5.29&lt;/akka.version&gt;
+      |  &lt;akka.http.version&gt;10.1.0&lt;/akka.http.version&gt;
       |&lt;/properties&gt;
       |&lt;dependency&gt;
       |  &lt;groupId&gt;com.typesafe.akka&lt;/groupId&gt;
       |  &lt;artifactId&gt;akka-stream_2.12&lt;/artifactId&gt;
-      |  &lt;version&gt;$${AkkaVersion}&lt;/version&gt;
+      |  &lt;version&gt;$${akka.version}&lt;/version&gt;
       |&lt;/dependency&gt;
       |&lt;dependency&gt;
       |  &lt;groupId&gt;com.typesafe.akka&lt;/groupId&gt;
       |  &lt;artifactId&gt;akka-http_2.12&lt;/artifactId&gt;
-      |  &lt;version&gt;$${AkkaHttpVersion}&lt;/version&gt;
+      |  &lt;version&gt;$${akka.http.version}&lt;/version&gt;
       |&lt;/dependency&gt;</code></pre>
       |</dd>
       |<dt>gradle</dt>