Remove LowLevelCacheEntry

- This is a follow-on to: https://www.pivotaltracker.com/story/show/70699932
fcrepo · May 10, 2014 · f7ef8f2 · f7ef8f2
1 parent c719b68
commit f7ef8f2
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 344 deletions.
diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/LowLevelCacheEntry.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/LowLevelCacheEntry.java
diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/utils/LowLevelCacheEntryIT.java b/fcrepo-kernel/src/test/java/org/fcrepo/integration/kernel/utils/LowLevelCacheEntryIT.java
diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/HierarchyRdfContextTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/HierarchyRdfContextTest.java
@@ -15,7 +15,6 @@
  */
 package org.fcrepo.kernel.rdf.impl;
 
-import static com.google.common.collect.ImmutableSet.of;
 import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource;
 import static com.hp.hpl.jena.vocabulary.RDF.type;
 import static org.fcrepo.kernel.RdfLexicon.CONTAINER;
@@ -55,7 +54,6 @@
 import org.fcrepo.kernel.rdf.HierarchyRdfContextOptions;
 import org.fcrepo.kernel.rdf.IdentifierTranslator;
 import org.fcrepo.kernel.testutilities.TestPropertyIterator;
-import org.fcrepo.kernel.utils.LowLevelCacheEntry;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -267,8 +265,6 @@ private void buildContentNode() throws RepositoryException {
                 mockBinaryProperty);
         when(mockBinaryProperty.getName()).thenReturn(JCR_DATA);
         when(mockBinaryProperty.getParent()).thenReturn(mockContentNode);
-        when(mockCacheEntry.getExternalIdentifier()).thenReturn(
-                testExternalIdentifier);
 
         when(mockContentNode.getProperties()).thenReturn(
                 new TestPropertyIterator(mockBinaryProperty));
@@ -352,9 +348,6 @@ private Model getResults(HierarchyRdfContextOptions options) throws RepositoryEx
     @Mock
     private Property mockBinaryProperty;
 
-    @Mock
-    private LowLevelCacheEntry mockCacheEntry;
-
     private static final Logger LOGGER =
         getLogger(HierarchyRdfContextTest.class);
 

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/PropertiesRdfContextTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/PropertiesRdfContextTest.java
@@ -17,7 +17,6 @@
 
 import static com.hp.hpl.jena.rdf.model.ResourceFactory.createResource;
 import static org.fcrepo.kernel.RdfLexicon.HAS_CONTENT;
-import static org.fcrepo.kernel.RdfLexicon.HAS_CONTENT_LOCATION;
 import static org.fcrepo.kernel.RdfLexicon.IS_CONTENT_OF;
 import static org.fcrepo.kernel.RdfLexicon.JCR_NAMESPACE;
 import static org.junit.Assert.assertTrue;
@@ -39,7 +38,6 @@
 import javax.jcr.nodetype.NodeType;
 
 import org.fcrepo.kernel.rdf.IdentifierTranslator;
-import org.fcrepo.kernel.utils.LowLevelCacheEntry;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -78,8 +76,6 @@ public void setUp() throws RepositoryException {
         when(mockNode.getMixinNodeTypes()).thenReturn(new NodeType[] {});
         when(mockContentNode.getMixinNodeTypes()).thenReturn(new NodeType[] {});
         when(mockContentNode.hasProperties()).thenReturn(false);
-        when(mockLowLevelCacheEntry.getExternalIdentifier()).thenReturn(
-                MOCK_EXTERNAL_IDENTIFIER);
         when(mockGraphSubjects.getSubject(mockNode.getPath())).thenReturn(mockSubject);
         when(mockGraphSubjects.getSubject(mockContentNode.getPath())).thenReturn(mockContentSubject);
         when(mockNode.getPrimaryNodeType()).thenReturn(mockNodeType);
@@ -125,9 +121,6 @@ public void setUp() throws RepositoryException {
     @Mock
     private NamespaceRegistry mockNamespaceRegistry;
 
-    @Mock
-    private LowLevelCacheEntry mockLowLevelCacheEntry;
-
     private static void
             logRdf(final String message, final Model model) throws IOException {
         LOGGER.debug(message);

diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrRdfToolsTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrRdfToolsTest.java
@@ -73,7 +73,6 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -707,7 +706,7 @@ private static void logRDF(final Model rdf) throws IOException {
     private BinaryValue mockBinary;
 
     @Mock
-    private LowLevelCacheEntry mockCacheEntry;
+    private CacheEntry mockCacheEntry;
 
     @Mock
     private QueryManager mockQueryManager;