Better RDFa template lookup (#1320)

Resolves #1318
trellis-ldp · Apr 25, 2021 · b49d133 · b49d133
1 parent 1cad9d2
commit b49d133
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -38,7 +38,7 @@ ext {
     jenaVersion = "4.0.0"
     jsonldVersion = "0.13.0"
     liquibaseVersion = "4.3.4"
-    mustacheVersion = "0.9.6"
+    mustacheVersion = "0.9.7"
     quarkusVersion = "1.13.2.Final"
     rxjavaVersion = "2.2.21"
     snakeyamlVersion = "1.28"

diff --git a/components/rdfa/src/main/java/org/trellisldp/rdfa/DefaultRdfaWriterService.java b/components/rdfa/src/main/java/org/trellisldp/rdfa/DefaultRdfaWriterService.java
@@ -18,17 +18,15 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.toList;
+import static org.slf4j.LoggerFactory.getLogger;
 
 import com.github.mustachejava.DefaultMustacheFactory;
 import com.github.mustachejava.Mustache;
 import com.github.mustachejava.MustacheFactory;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.io.Reader;
 import java.io.UncheckedIOException;
 import java.io.Writer;
 import java.util.Collections;
@@ -42,6 +40,7 @@
 
 import org.apache.commons.rdf.api.Triple;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.slf4j.Logger;
 import org.trellisldp.api.NamespaceService;
 import org.trellisldp.api.RDFaWriterService;
 
@@ -51,7 +50,7 @@
 @ApplicationScoped
 public class DefaultRdfaWriterService implements RDFaWriterService {
 
-    private static final MustacheFactory mf = new DefaultMustacheFactory();
+    private static final Logger LOGGER = getLogger(DefaultRdfaWriterService.class);
 
     /** The configuration key controlling the HTML template to use. */
     public static final String CONFIG_RDFA_TEMPLATE = "trellis.rdfa.template";
@@ -65,6 +64,7 @@ public class DefaultRdfaWriterService implements RDFaWriterService {
     /** The configuration key controlling the JS URLs to use. */
     public static final String CONFIG_RDFA_JS = "trellis.rdfa.js";
 
+    private MustacheFactory mf;
     private Mustache template;
 
     @Inject
@@ -90,9 +90,10 @@ public class DefaultRdfaWriterService implements RDFaWriterService {
 
     @PostConstruct
     void init() {
-        final String templatePath = templateLocation.orElse("org/trellisldp/rdfa/resource.mustache");
-        final File file = new File(templatePath);
-        template = file.exists() ? mf.compile(templatePath) : mf.compile(getReader(templatePath), templatePath);
+        final String resource = templateLocation.orElse("org/trellisldp/rdfa/resource.mustache");
+        LOGGER.info("Using RDFa writer template: {}", resource);
+        mf = new DefaultMustacheFactory();
+        template = mf.compile(resource);
     }
 
     /**
@@ -116,9 +117,4 @@ public void write(final Stream<Triple> triples, final OutputStream out, final St
             throw new UncheckedIOException(ex);
         }
     }
-
-    static Reader getReader(final String template) {
-        return new InputStreamReader(Thread.currentThread().getContextClassLoader()
-                    .getResourceAsStream(template), UTF_8);
-    }
 }
diff --git a/components/rdfa/src/main/resources/META-INF/services/org.trellisldp.api.RDFaWriterService b/components/rdfa/src/main/resources/META-INF/services/org.trellisldp.api.RDFaWriterService
diff --git a/components/test/src/main/java/org/trellisldp/test/LdpRdfTests.java b/components/test/src/main/java/org/trellisldp/test/LdpRdfTests.java
@@ -45,6 +45,7 @@
 
 import javax.ws.rs.ProcessingException;
 import javax.ws.rs.core.EntityTag;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.commons.rdf.api.Graph;
@@ -109,6 +110,7 @@ default Stream<Executable> runTests() throws Exception {
         return Stream.of(this::testGetJsonLdDefault,
                 this::testGetJsonLdCompacted,
                 this::testGetNTriples,
+                this::testGetRDFa,
                 this::testGetRDF,
                 this::testRdfContainment,
                 this::testPostJsonLd,
@@ -219,6 +221,12 @@ default void testGetNTriples() {
         }
     }
 
+    default void testGetRDFa() {
+        try (final Response res = target(getResourceLocation()).request().accept(MediaType.TEXT_HTML).get()) {
+            assertAll("Check for RDFa", checkRdfResponse(res, LDP.RDFSource, MediaType.TEXT_HTML_TYPE));
+        }
+    }
+
     /**
      * Test POSTing an RDF resource.
      */