Merging new changes from fork

app/modules/LayoutProviderModule.java

@@ -1,8 +1,9 @@
 package modules;
 
 import com.google.inject.AbstractModule;
-import play.Configuration;
-import play.Environment;
+import play.api.Configuration;
+import play.api.Environment;
+import play.api.Play;
 import services.LayoutProvider;
 
 /**
@@ -21,7 +22,8 @@ public LayoutProviderModule(Environment environment, Configuration configuration
 
   protected void configure() {
 
-    String vocabVersion = configuration.getString("layout.provider");
+    String vocabVersion = configuration.underlying().getString("layout.provider");
+
     try {
       Class<? extends LayoutProvider> bindingClass = environment.classLoader().loadClass(vocabVersion)
           .asSubclass(LayoutProvider.class);

app/modules/VocabProviderModule.java

@@ -1,8 +1,8 @@
 package modules;
 
 import com.google.inject.AbstractModule;
-import play.Configuration;
-import play.Environment;
+import play.api.Configuration;
+import play.api.Environment;
 import services.VocabProvider;
 
 /**
@@ -21,7 +21,7 @@ public VocabProviderModule(Environment environment, Configuration configuration)
 
   protected void configure() {
 
-    String vocabVersion = configuration.getString("vocab.provider");
+    String vocabVersion = configuration.underlying().getString("vocab.provider");
     try {
       Class<? extends VocabProvider> bindingClass = environment.classLoader().loadClass(vocabVersion)
           .asSubclass(VocabProvider.class);

app/services/DirectoryVocabProvider.java

@@ -3,8 +3,12 @@
 import com.google.inject.Inject;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigList;
+import com.typesafe.config.ConfigValue;
+import java.util.List;
 import org.apache.jena.riot.Lang;
-import play.Configuration;
+import play.api.Configuration;
 import play.Logger;
 
 import java.io.File;
@@ -13,6 +17,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import scala.Option;
 
 /**
  * Created by fo on 10.03.16.
@@ -23,17 +28,16 @@ public class DirectoryVocabProvider implements VocabProvider {
 
   @Inject
   public DirectoryVocabProvider(Configuration configuration) {
-
-    Configuration source = configuration.getConfig("source.data");
+    Config source = configuration.underlying().getConfig("source.data");
     String sourceDir = source.getString("dir");
-    Configuration formats = source.getConfig("formats");
+    Config formats = source.getConfig("formats");
     Path sourcePath = new File(sourceDir).isAbsolute()
         ? Paths.get(new File(sourceDir).getPath())
         : Paths.get(ClassLoader.getSystemResource(sourceDir).getPath());
 
-    for (String format : formats.asMap().keySet()) {
-      String ext = formats.getConfig(format).getString("ext");
-      String lang = formats.getConfig(format).getString("lang");
+    for (String formatName : formats.root().keySet()) {
+      String ext = formats.getConfig(formatName).getString("ext");
+      String lang = formats.getConfig(formatName).getString("lang");
       try (DirectoryStream<Path> files = Files.newDirectoryStream(sourcePath, "*".concat(ext))) {
         for (Path file : files) {
           vocab.read(Files.newInputStream(file), null, lang);
@@ -42,12 +46,10 @@ public DirectoryVocabProvider(Configuration configuration) {
         Logger.error(e.toString());
       }
     }
-
   }
 
   @Override
   public Model getVocab() {
     return vocab;
   }
-
 }

app/services/GitLayoutProvider.java

@@ -7,7 +7,7 @@
 import org.apache.jena.atlas.RuntimeIOException;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
-import play.Configuration;
+import play.api.Configuration;
 import play.Logger;
 
 import java.io.File;
@@ -34,7 +34,7 @@ public class ResourceTemplateLoader extends URLTemplateLoader {
 
     protected URL getResource(final String location) throws IOException {
 
-      File localPath = new File(gitSource.getString("local"), location.substring(1));
+      File localPath = new File(gitSource.underlying().getString("local"), location.substring(1));
       Logger.debug("Fetching " + localPath.toURI().toURL());
       return localPath.toURI().toURL();
 
@@ -45,14 +45,14 @@ protected URL getResource(final String location) throws IOException {
   @Inject
   public GitLayoutProvider(Configuration configuration) {
 
-    gitSource = configuration.getConfig("source.site.git");
+    gitSource = (Configuration) configuration.underlying().getConfig("source.site.git");
 
     try {
-      Logger.debug("Checking out template branch ".concat(gitSource.getString("branch")));
-      File localPath = new File(gitSource.getString("local"));
+      Logger.debug("Checking out template branch ".concat(gitSource.underlying().getString("branch")));
+      File localPath = new File(gitSource.underlying().getString("local"));
       FileUtils.deleteDirectory(localPath);
-      try (Git git = Git.cloneRepository().setURI(gitSource.getString("remote")).setDirectory(localPath).call()) {
-        git.checkout().setName(gitSource.getString("branch")).call();
+      try (Git git = Git.cloneRepository().setURI(gitSource.underlying().getString("remote")).setDirectory(localPath).call()) {
+        git.checkout().setName(gitSource.underlying().getString("branch")).call();
         git.getRepository().close();
       }
     } catch (IOException | GitAPIException e) {

app/services/GitVocabProvider.java

@@ -4,6 +4,12 @@
 import com.google.inject.Singleton;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
+
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigValue;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
 import org.apache.commons.io.FileUtils;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
@@ -16,13 +22,14 @@
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.treewalk.TreeWalk;
 import org.eclipse.jgit.treewalk.filter.PathSuffixFilter;
-import play.Configuration;
+import play.api.Configuration;
 import play.Logger;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import scala.Option;
 
 
 /**
@@ -37,29 +44,28 @@ public class GitVocabProvider implements VocabProvider {
   @Inject
   public GitVocabProvider(Configuration configuration) {
 
-    Configuration source = configuration.getConfig("source.data");
-    Configuration gitSource = source.getConfig("git");
-    Configuration formats = source.getConfig("formats");
-
+    Config source = configuration.underlying().getConfig("source.data");
+    Config gitSource = source.getConfig("git");
+    Config formats = source.getConfig("formats");
     try {
 
       String remoteURL = gitSource.getString("remote");
-      File localPath = new File(gitSource.getString("local"));
+      File localPath = new File(String.valueOf(gitSource.getString("local")));
       FileUtils.deleteDirectory(localPath);
 
       try (Git git = Git.cloneRepository().setURI(remoteURL).setDirectory(localPath).call()) {
 
         Repository repository = git.getRepository();
-        ObjectId lastCommitId = repository.resolve(gitSource.getString("rev"));
+        ObjectId lastCommitId = repository.resolve(String.valueOf(gitSource.getString("rev")));
 
         try (RevWalk revWalk = new RevWalk(repository)) {
 
           RevCommit commit = revWalk.parseCommit(lastCommitId);
           RevTree tree = commit.getTree();
 
-          for (String format : formats.asMap().keySet()) {
-            String ext = formats.getConfig(format).getString("ext");
-            String lang = formats.getConfig(format).getString("lang");
+          for (String formatName : formats.root().keySet()) {
+            String ext = formats.getConfig(formatName).getString("ext");
+            String lang =formats.getConfig(formatName).getString("lang");
 
             try (TreeWalk treeWalk = new TreeWalk(repository)) {
               treeWalk.addTree(tree);
@@ -74,19 +80,12 @@ public GitVocabProvider(Configuration configuration) {
                 vocab.read(bais, null, lang);
               }
             }
-
           }
-
           revWalk.dispose();
-
         }
-
       }
-
     } catch (IOException | GitAPIException e) {
-
       Logger.error(e.toString());
-
     }
 
   }

app/services/HttpLayoutProvider.java

@@ -17,15 +17,11 @@ public URLTemplateLoader getTemplateLoader() {
   }
 
   public class HttpTemplateLoader extends URLTemplateLoader {
-
     protected URL getResource(final String location) throws IOException {
-
       Logger.debug("Fetching " + location);
       // TODO: cache templates, see e.g. https://stackoverflow.com/a/45439170
       return new URL(location);
-
     }
-
   }
 
 }

app/services/LayoutProvider.java

@@ -6,7 +6,5 @@
  * Created by fo on 19.04.16.
  */
 public interface LayoutProvider {
-
   URLTemplateLoader getTemplateLoader();
-
 }

app/services/VocabProvider.java

@@ -7,7 +7,5 @@
  */
 
 public interface VocabProvider {
-
   public Model getVocab();
-
 }

app/views/index.scala.html

@@ -0,0 +1,12 @@
+@()
+
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Rights statements</title>
+  </head>
+  <body>
+    <h2>Rights statements</h2>
+  </body>
+</html>

build.sbt

@@ -2,7 +2,7 @@ name := "rights-app"
 
 version := "0.1"
 
-packageName in Universal := "rights-app-dist"
+Universal / packageName := "rights-app-dist"
 
 lazy val root = (project in file(".")).enablePlugins(PlayJava)
 
@@ -12,7 +12,15 @@ libraryDependencies += "org.apache.jena" % "apache-jena-libs" % "2.13.0"
 libraryDependencies += "com.github.jknack" % "handlebars" % "2.2.2"
 libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "4.0.1.201506240215-r"
 libraryDependencies += "commons-io" % "commons-io" % "2.4"
+libraryDependencies += "com.google.inject" % "guice" % "3+"
+libraryDependencies += "co.elastic.apm" % "elastic-apm-agent" % "1.34.1"
+libraryDependencies += guice
 
-javaOptions in Test += "-Dconfig.file=conf/test.conf"
+Test / javaOptions += "-Dconfig.file=conf/test.conf"
+Universal / javaOptions ++= Seq("-Dpidfile.path=/dev/null","-Dconfig.file=conf/environment.conf")
+scalaVersion := "2.13.14"
 
-scalaVersion := "2.11.11"
+enablePlugins(JavaAppPackaging,DockerPlugin)
+dockerExposedPorts := Seq(9000)
+dockerBaseImage := "eclipse-temurin:17-jdk"
+dockerRepository := Option("docker.io/europeana")

conf/application.conf

@@ -1,34 +1,42 @@
 play.modules.enabled += "modules.VocabProviderModule"
 play.modules.enabled += "modules.LayoutProviderModule"
 vocab.provider = "services.GitVocabProvider"
-source.data.formats.turtle.ext = ".ttl"
-source.data.formats.turtle.lang = "TURTLE"
-source.data.formats.json.ext = ".json"
-source.data.formats.json.lang = "JSONLD"
-source.data.git.remote = "https://github.com/rightsstatements/data-model.git"
+
+source.data.git.remote = "https://github.com/europeana/rightsstatements-data-model.git"
 source.data.git.local = "/tmp/data-model"
 source.data.git.rev = "master"
 layout.provider = "services.HttpLayoutProvider"
-source.site.git.remote = "https://github.com/rightsstatements/rightsstatements.github.io.git"
-source.site.git.local = "/tmp/rightsstatements.github.io"
-source.site.git.branch = "origin/production-pages"
+source.site.git.remote = "https://github.com/europeana/rightsstatements-website.git"
+source.site.git.local = "/tmp/rightsstatements-website.git"
+source.site.git.branch = "origin/master"
 default.mime = "application/json"
 default.parser = "JSON-LD"
 params.InC-OW-EU = "relatedURL"
 params.NoC-CR = "relatedURL"
 params.NoC-OKLR = "relatedURL"
 params.NoC-NC = "date"
-parser.text/turtle = "TURTLE"
-parser.application/json = "JSON-LD"
-parser.application/ld"+"json = "JSON-LD"
-parser."*"/"*" = "JSON-LD"
-extension.text/turtle = "ttl"
-extension.application/json = "json"
-extension.application/ld"+"json = "jsonld"
-extension."*"/"*" = "json"
-queries.vocab = "CONSTRUCT WHERE {?s <http://www.w3.org/2002/07/owl#versionInfo> \"%1$s\" . ?s ?p ?o}"
-queries.statement = "CONSTRUCT WHERE {?s <http://www.w3.org/2002/07/owl#versionInfo> \"%1$s\" . ?s <http://purl.org/dc/elements/1.1/identifier> \"%2$s\" . ?s ?p ?o}"
-queries.collection = "CONSTRUCT WHERE {<http://rightsstatements.org/vocab/collection-%1$s/%2$s/> <http://www.w3.org/2002/07/owl#versionInfo> \"%2$s\" . <http://rightsstatements.org/vocab/collection-%1$s/%2$s/> ?p ?o }"
-queries.localize = "CONSTRUCT {?s ?p ?o} WHERE {?s ?p ?o . FILTER(!isLiteral(?o) || lang(?o) = \"\" || langMatches(lang(?o), \"%1$s\" ))}"
+
+queries{
+vocab = "CONSTRUCT WHERE {?s <http://www.w3.org/2002/07/owl#versionInfo> \"%1$s\" . ?s ?p ?o}"
+statement = "CONSTRUCT WHERE {?s <http://www.w3.org/2002/07/owl#versionInfo> \"%1$s\" . ?s <http://purl.org/dc/elements/1.1/identifier> \"%2$s\" . ?s ?p ?o}"
+collection = "CONSTRUCT WHERE {<http://rightsstatements.org/vocab/collection-%1$s/%2$s/> <http://www.w3.org/2002/07/owl#versionInfo> \"%2$s\" . <http://rightsstatements.org/vocab/collection-%1$s/%2$s/> ?p ?o }"
+localize = "CONSTRUCT {?s ?p ?o} WHERE {?s ?p ?o . FILTER(!isLiteral(?o) || lang(?o) = \"\" || langMatches(lang(?o), \"%1$s\" ))}"
+}
+
 languages.available = "en ca de es et fi fr hi hr it lt nl pl"
-source.site.http = "https://rightsstatements.org"
+source.site.local="/resources"
+source.data.formats{
+  json {
+    ext =".json"
+    lang ="JSONLD"
+  }
+  turtle {
+    ext=".ttl"
+    lang="TURTLE"
+  }
+}
+play.server.pidfile.path=/dev/null
+play.http.secret.key = "^Z5sUMS0j^inD7xJ4/vt0rFC?F>y5@kkdiGN:ROV5lfaP1:[ag72[S8gLD90PZWS"
+play.filters.hosts {
+  allowed = ["."]
+}

conf/environment.conf

@@ -0,0 +1 @@
+include "application.conf"