minor refactor around newer flex parser

mvn-defaults/pom.xml

@@ -25,7 +25,7 @@
         <commons.text.version>1.8</commons.text.version>
         <docker.java.version>3.2.1</docker.java.version>
         <dse.driver.version>1.9.0</dse.driver.version>
-        <flexmark.version>0.50.20</flexmark.version>
+        <flexmark.version>0.61.6</flexmark.version>
         <greenrobot.version>3.0.0-RC1</greenrobot.version>
         <gson.version>2.8.5</gson.version>
         <hdrhistogram.version>2.1.10</hdrhistogram.version>
@@ -262,7 +262,12 @@
 
             <dependency>
                 <groupId>com.vladsch.flexmark</groupId>
-                <artifactId>flexmark-html-parser</artifactId>
+                <artifactId>flexmark-ext-yaml-front-matter</artifactId>
+                <version>${flexmark.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.vladsch.flexmark</groupId>
+                <artifactId>flexmark-html2md-converter</artifactId>
                 <version>${flexmark.version}</version>
             </dependency>
 

nb-api/pom.xml

@@ -37,11 +37,20 @@
             <artifactId>logback-classic</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.vladsch.flexmark</groupId>
+            <artifactId>flexmark-ext-yaml-front-matter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.vladsch.flexmark</groupId>
+            <artifactId>flexmark-html2md-converter</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>

nb-api/src/main/java/io/nosqlbench/nb/api/markdown/FlexParser.java

@@ -0,0 +1,12 @@
+package io.nosqlbench.nb.api.markdown;
+
+import com.vladsch.flexmark.ext.yaml.front.matter.YamlFrontMatterExtension;
+import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
+import com.vladsch.flexmark.parser.Parser;
+
+import java.util.List;
+
+public class FlexParser {
+    public static Parser parser = Parser.builder().extensions(List.of(YamlFrontMatterExtension.create())).build();
+    public static FlexmarkHtmlConverter converter = FlexmarkHtmlConverter.builder().build();
+}

virtdata-userlibs/pom.xml

@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -14,6 +15,12 @@
     <url>http://nosqlbench.io/</url>
 
     <dependencies>
+        <dependency>
+            <groupId>io.nosqlbench</groupId>
+            <artifactId>virtdata-api</artifactId>
+            <version>3.12.87-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-realdata</artifactId>
@@ -24,38 +31,29 @@
             <artifactId>virtdata-lib-realer</artifactId>
             <version>3.12.87-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>io.nosqlbench</groupId>
-            <artifactId>virtdata-api</artifactId>
-            <version>3.12.87-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>virtdata-lib-random</artifactId>
             <version>3.12.87-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <artifactId>virtdata-lib-basics</artifactId>
             <groupId>io.nosqlbench</groupId>
+            <artifactId>virtdata-lib-basics</artifactId>
             <version>3.12.87-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <artifactId>virtdata-lib-curves4</artifactId>
             <groupId>io.nosqlbench</groupId>
+            <artifactId>virtdata-lib-curves4</artifactId>
             <version>3.12.87-SNAPSHOT</version>
         </dependency>
 
+        <!-- TODO: remove this after pivoting deps to core nb-api doc manifest -->
         <dependency>
             <groupId>io.nosqlbench</groupId>
             <artifactId>docsys</artifactId>
             <version>3.12.87-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.vladsch.flexmark</groupId>
-            <artifactId>flexmark-html-parser</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -89,7 +87,8 @@
                 </executions>
                 <configuration>
                     <additionalClasspathElements>
-                        <additionalClasspathElement>${project.basedir}/target/virtdata-userlibs-${project.version}.jar</additionalClasspathElement>
+                        <additionalClasspathElement>${project.basedir}/target/virtdata-userlibs-${project.version}.jar
+                        </additionalClasspathElement>
                     </additionalClasspathElements>
                     <includes>
                         <include>**/*Integrated*Test*.java</include>
@@ -126,10 +125,12 @@
                         <artifactId>maven-shade-plugin</artifactId>
                         <configuration>
                             <transformers combine.children="append">
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>io.nosqlbench.virtdata.userlibs.apps.VirtDataMainApp</mainClass>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer
+                                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                             </transformers>
                             <minimizeJar>false</minimizeJar>
                             <finalName>${project.artifactId}</finalName>

virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java

@@ -1,7 +1,6 @@
 package io.nosqlbench.virtdata.userlibs.apps.docsapp.fdocs;
 
-import com.vladsch.flexmark.convert.html.FlexmarkHtmlParser;
+import io.nosqlbench.nb.api.markdown.FlexParser;
-import io.nosqlbench.virtdata.api.processors.DocCtorData;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -58,7 +57,7 @@ public class FDocFuncs implements Iterable<FDocFunc> {
 
         sb.append("## ").append(getFunctionName()).append("\n\n");
 
-        String classDocMarkdown = FlexmarkHtmlParser.parse(getCombinedClassDocs());
+        String classDocMarkdown = FlexParser.converter.convert(getCombinedClassDocs());
         sb.append(classDocMarkdown).append("\n");
 
         for (FDocFunc fdf : functionsByPackage.values()) {