Adjust JPMS visibility for resources (#877)

trellis-ldp · May 27, 2020 · 9f5635e · 9f5635e
1 parent cfdd6b8
commit 9f5635e
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 8 deletions.
diff --git a/auth/webac/src/main/java/module-info.java b/auth/webac/src/main/java/module-info.java
@@ -32,4 +32,6 @@
 
     uses org.trellisldp.api.ResourceService;
     uses org.trellisldp.api.IOService;
+
+    opens org.trellisldp.webac;
 }
diff --git a/components/file/src/main/java/module-info.java b/components/file/src/main/java/module-info.java
@@ -32,6 +32,8 @@
     requires org.apache.commons.codec;
     requires org.apache.jena.core;
 
+    opens org.trellisldp.file;
+
     provides org.trellisldp.api.BinaryService
         with org.trellisldp.file.FileBinaryService;
     provides org.trellisldp.api.MementoService

diff --git a/components/file/src/main/java/org/trellisldp/file/FileNamespaceService.java b/components/file/src/main/java/org/trellisldp/file/FileNamespaceService.java
@@ -94,7 +94,8 @@ public boolean setPrefix(final String prefix, final String namespace) {
 
     private void init() {
         if (data.isEmpty()) {
-            data.putAll(read(getClass().getResource("/org/trellisldp/file/defaultNamespaces.json").getPath()));
+            data.putAll(read(Thread.currentThread().getContextClassLoader()
+                        .getResource("org/trellisldp/file/defaultNamespaces.json").getPath()));
             write(filePath, data);
         }
         data.forEach((k, v) -> dataRev.put(v, k));

diff --git a/components/jdbc/src/main/java/module-info.java b/components/jdbc/src/main/java/module-info.java
@@ -38,4 +38,6 @@
 
     uses org.trellisldp.api.IdentifierService;
     uses org.trellisldp.api.MementoService;
+
+    opens org.trellisldp.jdbc;
 }
diff --git a/...src/main/resources/initial_namespaces.csv → ...rg/trellisldp/jdbc/initial_namespaces.csv b/...src/main/resources/initial_namespaces.csv → ...rg/trellisldp/jdbc/initial_namespaces.csv
diff --git a/...c/src/main/resources/initial_resource.csv → .../org/trellisldp/jdbc/initial_resource.csv b/...c/src/main/resources/initial_resource.csv → .../org/trellisldp/jdbc/initial_resource.csv
diff --git a/...main/resources/initial_resource_mysql.csv → ...rellisldp/jdbc/initial_resource_mysql.csv b/...main/resources/initial_resource_mysql.csv → ...rellisldp/jdbc/initial_resource_mysql.csv
diff --git a/...ts/jdbc/src/main/resources/migrations.yml → ...ources/org/trellisldp/jdbc/migrations.yml b/...ts/jdbc/src/main/resources/migrations.yml → ...ources/org/trellisldp/jdbc/migrations.yml
@@ -391,7 +391,7 @@ databaseChangeLog:
                     - column:
                         name: acl
                         type: BOOLEAN
-                file: initial_resource${csv}.csv
+                file: org/trellisldp/jdbc/initial_resource${csv}.csv
     - changeSet:
         id: 2
         author: acoburn
@@ -422,7 +422,7 @@ databaseChangeLog:
                     - column:
                         name: namespace
                         type: STRING
-                file: initial_namespaces.csv
+                file: org/trellisldp/jdbc/initial_namespaces.csv
     - changeSet:
         id: 3
         author: acoburn

diff --git a/components/jdbc/src/test/java/org/trellisldp/jdbc/DBNamespaceServiceTest.java b/components/jdbc/src/test/java/org/trellisldp/jdbc/DBNamespaceServiceTest.java
@@ -53,7 +53,7 @@ class DBNamespaceServiceTest {
 
             // Set up database migrations
             try (final Connection c = pg.getPostgresDatabase().getConnection()) {
-                final Liquibase liquibase = new Liquibase("migrations.yml",
+                final Liquibase liquibase = new Liquibase("org/trellisldp/jdbc/migrations.yml",
                         new ClassLoaderResourceAccessor(),
                         new JdbcConnection(c));
                 final Contexts ctx = null;

diff --git a/components/jdbc/src/test/java/org/trellisldp/jdbc/DBResourceTest.java b/components/jdbc/src/test/java/org/trellisldp/jdbc/DBResourceTest.java
@@ -106,7 +106,7 @@ class DBResourceTest {
 
             // Set up database migrations
             try (final Connection c = pg.getPostgresDatabase().getConnection()) {
-                final Liquibase liquibase = new Liquibase("migrations.yml",
+                final Liquibase liquibase = new Liquibase("org/trellisldp/jdbc/migrations.yml",
                         new ClassLoaderResourceAccessor(),
                         new JdbcConnection(c));
                 final Contexts ctx = null;

diff --git a/components/jdbc/src/test/java/org/trellisldp/jdbc/DBTestUtils.java b/components/jdbc/src/test/java/org/trellisldp/jdbc/DBTestUtils.java
@@ -48,7 +48,7 @@ static EmbeddedPostgres setupDatabase(final String directory) {
 
             // Set up database migrations
             try (final Connection c = pg.getPostgresDatabase().getConnection()) {
-                final Liquibase liquibase = new Liquibase("migrations.yml",
+                final Liquibase liquibase = new Liquibase("org/trellisldp/jdbc/migrations.yml",
                         new ClassLoaderResourceAccessor(),
                         new JdbcConnection(c));
                 final Contexts ctx = null;

diff --git a/components/jdbc/src/test/java/org/trellisldp/jdbc/DBWrappedMementoServiceTest.java b/components/jdbc/src/test/java/org/trellisldp/jdbc/DBWrappedMementoServiceTest.java
@@ -72,7 +72,7 @@ class DBWrappedMementoServiceTest {
 
             // Set up database migrations
             try (final Connection c = pg.getPostgresDatabase().getConnection()) {
-                final Liquibase liquibase = new Liquibase("migrations.yml",
+                final Liquibase liquibase = new Liquibase("org/trellisldp/jdbc/migrations.yml",
                         new ClassLoaderResourceAccessor(),
                         new JdbcConnection(c));
                 final Contexts ctx = null;

diff --git a/components/test/src/main/java/module-info.java b/components/test/src/main/java/module-info.java
@@ -35,4 +35,6 @@
     requires java.ws.rs;
     requires java.xml.bind;
     requires jakarta.inject;
+
+    opens org.trellisldp.test;
 }
diff --git a/platform/dropwizard/src/main/java/org/trellisldp/dropwizard/app/TrellisApplication.java b/platform/dropwizard/src/main/java/org/trellisldp/dropwizard/app/TrellisApplication.java
@@ -64,7 +64,7 @@ public DataSourceFactory getDataSourceFactory(final AppConfiguration config) {
             }
             @Override
             public String getMigrationsFileName() {
-                return "migrations.yml";
+                return "org/trellisldp/jdbc/migrations.yml";
             }
         });
     }