Migrate to Jena 3.x (#71)

Addresses: https://jira.duraspace.org/browse/FCREPO-1672
fcrepo4 · Aug 25, 2016 · 2bd8a7c · 2bd8a7c
1 parent 454d0d4
commit 2bd8a7c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/org/fcrepo/auth/webac/LinkHeaderProvider.java b/src/main/java/org/fcrepo/auth/webac/LinkHeaderProvider.java
@@ -21,7 +21,7 @@
 import static org.fcrepo.kernel.api.RdfCollectors.toModel;
 import static org.fcrepo.kernel.api.RequiredRdfContext.PROPERTIES;
 import static org.slf4j.LoggerFactory.getLogger;
-import static com.hp.hpl.jena.rdf.model.ResourceFactory.createProperty;
+import static org.apache.jena.rdf.model.ResourceFactory.createProperty;
 
 import java.net.URI;
 
@@ -42,7 +42,7 @@
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Multimap;
-import com.hp.hpl.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Resource;
 
 import org.springframework.stereotype.Component;
 

diff --git a/src/main/java/org/fcrepo/auth/webac/WebACRolesProvider.java b/src/main/java/org/fcrepo/auth/webac/WebACRolesProvider.java
@@ -25,8 +25,8 @@
 import static java.util.stream.Stream.concat;
 import static java.util.stream.Stream.empty;
 import static java.util.stream.Stream.of;
-import static com.hp.hpl.jena.graph.NodeFactory.createURI;
-import static com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel;
+import static org.apache.jena.graph.NodeFactory.createURI;
+import static org.apache.jena.rdf.model.ModelFactory.createDefaultModel;
 import static org.apache.jena.riot.Lang.TTL;
 import static org.fcrepo.auth.webac.URIConstants.FOAF_AGENT_VALUE;
 import static org.fcrepo.auth.webac.URIConstants.FOAF_GROUP;
@@ -82,11 +82,11 @@
 import org.modeshape.jcr.value.Path;
 import org.slf4j.Logger;
 
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.shared.JenaException;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.shared.JenaException;
 
 /**
  * @author acoburn
@@ -323,7 +323,7 @@ private static Stream<String> getAgentMembers(final IdentifierConverter<Resource
      * Map a Jena Node to a Stream of Strings. Any non-URI, non-Literals map to an empty Stream,
      * making this suitable to use with flatMap.
      */
-    private static final Stream<String> nodeToStringStream(final com.hp.hpl.jena.graph.Node object) {
+    private static final Stream<String> nodeToStringStream(final org.apache.jena.graph.Node object) {
         if (object.isURI()) {
             return of(object.getURI());
         } else if (object.isLiteral()) {
@@ -462,7 +462,7 @@ private static List<WebACAuthorization> getDefaultAuthorizations() {
         return authorizations;
     }
 
-    private static Stream<String> additionalAgentValues(final com.hp.hpl.jena.graph.Node object) {
+    private static Stream<String> additionalAgentValues(final org.apache.jena.graph.Node object) {
         final String groupBaseUri = System.getProperty(GROUP_AGENT_BASE_URI_PROPERTY);
         final String userBaseUri = System.getProperty(USER_AGENT_BASE_URI_PROPERTY);
 

diff --git a/src/test/java/org/fcrepo/auth/webac/WebACRolesProviderTest.java b/src/test/java/org/fcrepo/auth/webac/WebACRolesProviderTest.java
@@ -17,9 +17,9 @@
  */
 package org.fcrepo.auth.webac;
 
-import static com.hp.hpl.jena.graph.NodeFactory.createURI;
-import static com.hp.hpl.jena.graph.Triple.create;
-import static com.hp.hpl.jena.rdf.model.ModelFactory.createDefaultModel;
+import static org.apache.jena.graph.NodeFactory.createURI;
+import static org.apache.jena.graph.Triple.create;
+import static org.apache.jena.rdf.model.ModelFactory.createDefaultModel;
 import static java.util.stream.Stream.of;
 import static org.apache.jena.riot.Lang.TTL;
 import static org.fcrepo.auth.webac.URIConstants.FOAF_GROUP;
@@ -50,8 +50,8 @@
 import javax.jcr.Property;
 import javax.jcr.Session;
 
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.rdf.model.Model;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.rdf.model.Model;
 import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.RDFDataMgr;
 import org.fcrepo.auth.roles.common.AccessRolesProvider;