Refactor constants (#57)

* Refactors commonly used strings into RdfLexicon constants class.

Author: dbernstein

build.gradle

@@ -14,6 +14,7 @@ ext {
     jenaVersion = '3.4.0'
     daggerVersion = '2.12'
     awsSdkVersion = '1.11.218'
+    guavaVersion = '20.0'
 }
 
 allprojects {
@@ -72,6 +73,7 @@ subprojects {
 
     //ensures that idea sees the generated source files in the src classpath
     def generated = new File(buildDir, "generated/source/apt/main")
+
     idea.module.sourceDirs += generated
 
 }
@@ -87,7 +89,7 @@ project(':lambdora-http-api') {
                 'com.fasterxml.jackson.core:jackson-core:2.9.2',
                 'com.fasterxml.jackson.core:jackson-databind:2.9.2',
                 'com.fasterxml.jackson.core:jackson-annotations:2.9.2',
-                'com.google.guava:guava:20.0',
+                "com.google.guava:guava:${guavaVersion}",
                 'org.apache.httpcomponents:httpcore:4.4.8',
                 'org.apache.httpcomponents:httpmime:4.5.3',
                 'org.glassfish.jersey.media:jersey-media-multipart:2.24',
@@ -141,6 +143,17 @@ project(':lambdora-common-test') {
     }
 }
 
+project(':lambdora-common') {
+    dependencies {
+        compile("org.apache.jena:jena-core:${jenaVersion}",
+                "org.apache.jena:jena-iri:${jenaVersion}",
+                "org.apache.jena:jena-arq:${jenaVersion}",
+                "com.google.guava:guava:${guavaVersion}"
+
+        )
+    }
+}
+
 task wrapper(type: Wrapper) {
     gradleVersion = '4.2.1'
 }

lambdora-common/src/main/java/org/fcrepo/lambdora/common/rdf/RdfLexicon.java

@@ -0,0 +1,293 @@
+package org.fcrepo.lambdora.common.rdf;
+/*
+ * Licensed to DuraSpace under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * DuraSpace licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.google.common.collect.ImmutableSet;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.Resource;
+
+import java.util.Set;
+import java.util.function.Predicate;
+
+import static org.apache.jena.rdf.model.ResourceFactory.createProperty;
+import static org.apache.jena.rdf.model.ResourceFactory.createResource;
+
+import static com.google.common.collect.ImmutableSet.of;
+
+/**
+ * A lexicon of the RDF properties that the fcrepo kernel (or close-to-core modules) use
+ *
+ * @author ajs6f
+ */
+public final class RdfLexicon {
+
+    /**
+     * Repository namespace "fedora"
+     **/
+    public static final String REPOSITORY_NAMESPACE = "http://fedora.info/definitions/v4/repository#";
+
+    public static final String EVENT_NAMESPACE = "http://fedora.info/definitions/v4/event#";
+
+    public static final String EBUCORE_NAMESPACE = "http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#";
+
+    public static final String PROV_NAMESPACE = "http://www.w3.org/ns/prov#";
+
+    public static final String PREMIS_NAMESPACE = "http://www.loc.gov/premis/rdf/v1#";
+
+    /**
+     * Fedora configuration namespace "fedora-config", used for user-settable
+     * configuration properties.
+     **/
+    // TODO from UCDetector: Constant "RdfLexicon.FEDORA_CONFIG_NAMESPACE" has 0 references
+    // should be referenced again when versioning is back in REST api
+    public static final String FEDORA_CONFIG_NAMESPACE = // NO_UCD (unused code)
+        "info:fedoraconfig/";
+
+    /**
+     * Linked Data Platform namespace.
+     */
+    public static final String LDP_NAMESPACE = "http://www.w3.org/ns/ldp#";
+
+    /**
+     * RDF  Syntax namespace.
+     */
+    public static final String RDF_SYNTAX_NAMESPACE = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+
+    /**
+     * SPARQL service description namespace.
+     */
+    public static final String SPARQL_SD_NAMESPACE =
+        "http://www.w3.org/ns/sparql-service-description#";
+
+
+    //RDF Syntax
+    public static final Property TYPE =
+        createProperty(RDF_SYNTAX_NAMESPACE + "type");
+
+    /**
+     * Is this namespace one that the repository manages?
+     */
+    public static final Predicate<String> isManagedNamespace = p -> p.equals(REPOSITORY_NAMESPACE);
+
+    // MEMBERSHIP
+    public static final Property HAS_PARENT =
+        createProperty(REPOSITORY_NAMESPACE + "hasParent");
+    public static final Property HAS_CHILD =
+        createProperty(REPOSITORY_NAMESPACE + "hasChild");
+
+    public static final Set<Property> membershipProperties = of(HAS_PARENT, HAS_CHILD);
+
+    // FIXITY
+
+    public static final Resource FIXITY_TYPE = createResource(PREMIS_NAMESPACE + "Fixity");
+
+    public static final Property HAS_MESSAGE_DIGEST_ALGORITHM =
+        createProperty(PREMIS_NAMESPACE + "hasMessageDigestAlgorithm");
+
+    public static final Property HAS_MESSAGE_DIGEST =
+        createProperty(PREMIS_NAMESPACE + "hasMessageDigest");
+
+    public static final Property HAS_SIZE =
+        createProperty(PREMIS_NAMESPACE + "hasSize");
+    public static final Property HAS_FIXITY_RESULT =
+        createProperty(PREMIS_NAMESPACE + "hasFixity");
+
+    public static final Property HAS_FIXITY_CHECK_COUNT =
+        createProperty(REPOSITORY_NAMESPACE + "numFixityChecks");
+    public static final Property HAS_FIXITY_ERROR_COUNT =
+        createProperty(REPOSITORY_NAMESPACE + "numFixityErrors");
+    public static final Property HAS_FIXITY_REPAIRED_COUNT =
+        createProperty(REPOSITORY_NAMESPACE + "numFixityRepaired");
+
+    public static final Set<Property> fixityProperties = of(
+        HAS_FIXITY_RESULT, HAS_MESSAGE_DIGEST, HAS_SIZE,
+        HAS_FIXITY_CHECK_COUNT, HAS_FIXITY_ERROR_COUNT, HAS_FIXITY_REPAIRED_COUNT);
+
+    public static final Resource EVENT_OUTCOME_INFORMATION = createResource(PREMIS_NAMESPACE + "EventOutcomeDetail");
+
+    public static final Property HAS_FIXITY_STATE =
+        createProperty(PREMIS_NAMESPACE + "hasEventOutcome");
+
+    public static final Property WRITABLE =
+        createProperty(REPOSITORY_NAMESPACE + "writable");
+
+    // Server managed properties
+    public static final Property CREATED_DATE =
+        createProperty(REPOSITORY_NAMESPACE + "created");
+    public static final Property CREATED_BY =
+        createProperty(REPOSITORY_NAMESPACE + "createdBy");
+    public static final Property LAST_MODIFIED_DATE =
+        createProperty(REPOSITORY_NAMESPACE + "lastModified");
+    public static final Property LAST_MODIFIED_BY =
+        createProperty(REPOSITORY_NAMESPACE + "lastModifiedBy");
+    public static final Set<Property> serverManagedProperties = of(
+        CREATED_DATE, CREATED_BY, LAST_MODIFIED_DATE, LAST_MODIFIED_BY);
+
+    // Fedora Namespace properties
+    public static final Property FEDORA_CONTAINER =
+        createProperty(REPOSITORY_NAMESPACE + "Container");
+    public static final Property FEDORA_RESOURCE =
+        createProperty(REPOSITORY_NAMESPACE + "Resource");
+
+
+
+    // Linked Data Platform
+    public static final Property PAGE =
+        createProperty(LDP_NAMESPACE + "Page");
+    public static final Resource CONTAINER =
+        createResource(LDP_NAMESPACE + "Container");
+    public static final Resource BASIC_CONTAINER =
+        createResource(LDP_NAMESPACE + "BasicContainer");
+    public static final Resource DIRECT_CONTAINER =
+        createResource(LDP_NAMESPACE + "DirectContainer");
+    public static final Resource INDIRECT_CONTAINER =
+        createResource(LDP_NAMESPACE + "IndirectContainer");
+    public static final Property MEMBERSHIP_RESOURCE =
+        createProperty(LDP_NAMESPACE + "membershipResource");
+    public static final Property HAS_MEMBER_RELATION =
+        createProperty(LDP_NAMESPACE + "hasMemberRelation");
+    public static final Property CONTAINS =
+        createProperty(LDP_NAMESPACE + "contains");
+    public static final Property LDP_MEMBER =
+        createProperty(LDP_NAMESPACE + "member");
+    public static final Property RDF_SOURCE =
+        createProperty(LDP_NAMESPACE + "RDFSource");
+    public static final Property NON_RDF_SOURCE =
+        createProperty(LDP_NAMESPACE + "NonRDFSource");
+    public static final Property CONSTRAINED_BY =
+        createProperty(LDP_NAMESPACE + "constrainedBy");
+    public static final Property MEMBER_SUBJECT =
+        createProperty(LDP_NAMESPACE + "MemberSubject");
+
+    /**
+     * Prefix for internal repository resources
+     */
+    public static final String INTERNAL_URI_PREFIX = "fedora://info";
+
+    private static final Set<Property> ldpManagedProperties = of(CONTAINS);
+
+    // REPOSITORY INFORMATION
+    public static final Property HAS_OBJECT_COUNT =
+        createProperty(REPOSITORY_NAMESPACE + "objectCount");
+    public static final Property HAS_OBJECT_SIZE =
+        createProperty(REPOSITORY_NAMESPACE + "objectSize");
+    public static final Property HAS_TRANSACTION_SERVICE =
+        createProperty(REPOSITORY_NAMESPACE + "hasTransactionProvider");
+    public static final Property HAS_ACCESS_ROLES_SERVICE =
+        createProperty(REPOSITORY_NAMESPACE + "hasAccessRoles");
+
+    public static final Set<Property> repositoryProperties = of(
+        HAS_OBJECT_COUNT, HAS_OBJECT_SIZE, HAS_TRANSACTION_SERVICE);
+
+    // NAMESPACES
+    public static final Property HAS_NAMESPACE_PREFIX =
+        createProperty("http://purl.org/vocab/vann/preferredNamespacePrefix");
+    public static final Property HAS_NAMESPACE_URI =
+        createProperty("http://purl.org/vocab/vann/preferredNamespaceUri");
+
+    public static final Set<Property> namespaceProperties = of(
+        HAS_NAMESPACE_PREFIX, HAS_NAMESPACE_URI);
+
+    // OTHER SERVICES
+    public static final Property HAS_VERSION_HISTORY =
+        createProperty(REPOSITORY_NAMESPACE + "hasVersions");
+    public static final Property HAS_FIXITY_SERVICE =
+        createProperty(REPOSITORY_NAMESPACE + "hasFixityService");
+    public static final Property HAS_SPARQL_ENDPOINT =
+        createProperty(SPARQL_SD_NAMESPACE + "endpoint");
+
+    public static final Set<Property> otherServiceProperties = of(
+        HAS_VERSION_HISTORY, HAS_FIXITY_SERVICE);
+
+
+    // BINARY DESCRIPTIONS
+    public static final Property DESCRIBES =
+        createProperty("http://www.iana.org/assignments/relation/describes");
+    public static final Property DESCRIBED_BY =
+        createProperty("http://www.iana.org/assignments/relation/describedby");
+
+    public static final Set<Property> structProperties = of(DESCRIBES, DESCRIBED_BY);
+
+    // CONTENT
+    public static final Resource CONTENT_LOCATION_TYPE =
+        createResource(PREMIS_NAMESPACE + "ContentLocation");
+    public static final Resource INACCESSIBLE_RESOURCE =
+        createResource(REPOSITORY_NAMESPACE + "inaccessibleResource");
+    public static final Property HAS_CONTENT_LOCATION =
+        createProperty(PREMIS_NAMESPACE + "hasContentLocation");
+    public static final Property HAS_CONTENT_LOCATION_VALUE =
+        createProperty(PREMIS_NAMESPACE + "hasContentLocationValue");
+    public static final Property HAS_MIME_TYPE =
+        createProperty(EBUCORE_NAMESPACE + "hasMimeType");
+    public static final Property HAS_ORIGINAL_NAME =
+        createProperty(EBUCORE_NAMESPACE + "filename");
+
+    public static final Set<Property> contentProperties = of(HAS_CONTENT_LOCATION, HAS_CONTENT_LOCATION_VALUE,
+        HAS_SIZE);
+
+
+    // VERSIONING
+    public static final Property HAS_VERSION =
+        createProperty(REPOSITORY_NAMESPACE + "hasVersion");
+    public static final Property HAS_VERSION_LABEL =
+        createProperty(REPOSITORY_NAMESPACE + "hasVersionLabel");
+
+    public static final Set<Property> versioningProperties = of(HAS_VERSION,
+        HAS_VERSION_LABEL);
+
+    // RDF EXTRACTION
+    public static final Property COULD_NOT_STORE_PROPERTY =
+        createProperty(REPOSITORY_NAMESPACE + "couldNotStoreProperty");
+    public static final Property INBOUND_REFERENCES = createProperty(REPOSITORY_NAMESPACE + "InboundReferences");
+    public static final Property EMBED_CONTAINS = createProperty(REPOSITORY_NAMESPACE + "EmbedResources");
+    public static final Property SERVER_MANAGED = createProperty(REPOSITORY_NAMESPACE + "ServerManaged");
+
+    public static final Set<Property> managedProperties;
+
+    static {
+        final ImmutableSet.Builder<Property> b = ImmutableSet.builder();
+        b.addAll(membershipProperties).addAll(fixityProperties).addAll(ldpManagedProperties).addAll(
+            repositoryProperties).addAll(namespaceProperties).addAll(
+            otherServiceProperties).addAll(structProperties).addAll(contentProperties).addAll(
+            versioningProperties).addAll(serverManagedProperties);
+        managedProperties = b.build();
+    }
+
+    public static final Set<Property> relaxableProperties
+        = of(LAST_MODIFIED_BY, LAST_MODIFIED_DATE, CREATED_BY, CREATED_DATE);
+
+    public static final String SERVER_MANAGED_PROPERTIES_MODE = "fcrepo.properties.management";
+
+    private static Predicate<Property> hasFedoraNamespace =
+        p -> !p.isAnon() && p.getNameSpace().startsWith(REPOSITORY_NAMESPACE);
+
+    public static final Predicate<Property> isRelaxed =
+        p -> relaxableProperties.contains(p)
+            && ("relaxed".equals(System.getProperty(SERVER_MANAGED_PROPERTIES_MODE)));
+
+    /**
+     * Detects whether an RDF property is managed by the repository.
+     */
+    public static final Predicate<Property> isManagedPredicate =
+        hasFedoraNamespace.or(p -> managedProperties.contains(p));
+
+    private RdfLexicon() {
+
+    }
+}
+

lambdora-common/src/main/java/org/fcrepo/lambdora/common/utils/UriUtils.java

@@ -2,21 +2,20 @@
 
 import java.net.URI;
 
+import static org.fcrepo.lambdora.common.rdf.RdfLexicon.INTERNAL_URI_PREFIX;
+
 /**
  * UriUtils
  *
  * @author dbernstein
  */
 public class UriUtils {
 
-    /**
-     * Prefix for internal repository resources
-     */
-    public static final String INTERNAL_URI_PREFIX = "fedora://info";
-
     private UriUtils() {
     }
 
+    private static final URI ROOT = URI.create(INTERNAL_URI_PREFIX + "/");
+
     /**
      * Returns the parent URI or null if the specified uri is the root uri
      *
@@ -27,13 +26,16 @@ public static URI getParent(final URI uri) {
         if (isRoot(uri)) {
             return null;
         } else {
+            //get the parent path (with a slash on the end)
             final URI parent = uri.getPath().endsWith("/") ? uri.resolve("..") : uri.resolve(".");
             final String parentStr = parent.toString();
+            //if the resolved parent is root, return it is as, otherwise remove the slash and
+            //return it.
             return isRoot(parent) ? parent : URI.create(parentStr.substring(0, parentStr.length() - 1));
         }
     }
 
     private static boolean isRoot(final URI uri) {
-        return uri.getPath().equals("/");
+        return ROOT.equals(uri);
     }
 }

lambdora-common/src/test/java/org/fcrepo/lambdora/common/utils/UriUtilsTest.java

@@ -6,7 +6,7 @@
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNull;
-import static org.fcrepo.lambdora.common.utils.UriUtils.INTERNAL_URI_PREFIX;
+import static org.fcrepo.lambdora.common.rdf.RdfLexicon.INTERNAL_URI_PREFIX;
 
 /**
  * UriUtils

lambdora-http-api/src/main/java/org/fcrepo/lambdora/ldp/LambdoraLdp.java

@@ -63,7 +63,7 @@
 import static org.fcrepo.http.commons.domain.RDFMediaType.TEXT_PLAIN_WITH_CHARSET;
 import static org.fcrepo.http.commons.domain.RDFMediaType.TURTLE_WITH_CHARSET;
 import static org.fcrepo.http.commons.domain.RDFMediaType.TURTLE_X;
-import static org.fcrepo.lambdora.common.utils.UriUtils.INTERNAL_URI_PREFIX;
+import static org.fcrepo.lambdora.common.rdf.RdfLexicon.INTERNAL_URI_PREFIX;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**