From 5c8fa6347b326f62ba2edaec08db17f9d26b1f49 Mon Sep 17 00:00:00 2001 From: ajs6f Date: Tue, 19 Nov 2013 11:13:23 -0500 Subject: [PATCH] Minor change to JcrRdfTools.getTreeTriples() --- .../main/java/org/fcrepo/kernel/FedoraResource.java | 7 +++---- .../fcrepo/kernel/rdf/impl/JcrGraphProperties.java | 9 +++++---- .../java/org/fcrepo/kernel/utils/JcrRdfTools.java | 13 +++++-------- .../java/org/fcrepo/kernel/FedoraResourceTest.java | 6 +++--- .../kernel/rdf/impl/JcrGraphPropertiesTest.java | 8 ++++---- .../org/fcrepo/kernel/utils/JcrRdfToolsTest.java | 7 ++++--- 6 files changed, 24 insertions(+), 26 deletions(-) diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraResource.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraResource.java index 8898206ca6..3ad75e62c7 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraResource.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraResource.java @@ -245,12 +245,11 @@ public Dataset getPropertiesDataset(final GraphSubjects graphSubjects, JcrRdfTools.withContext(graphSubjects, getNode().getSession()); final RdfStream propertiesStream = - jcrRdfTools.getJcrTriples(getNode()).limit(limit).skip(offset); + jcrRdfTools.getJcrTriples(getNode()); - propertiesStream.concat(jcrRdfTools.getTreeTriples(getNode(), offset, - limit)); + propertiesStream.concat(jcrRdfTools.getTreeTriples(getNode())); - final Dataset dataset = DatasetFactory.create(propertiesStream.asModel()); + final Dataset dataset = DatasetFactory.create(propertiesStream.limit(limit).skip(offset).asModel()); final Model problemsModel = createDefaultModel(); diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/rdf/impl/JcrGraphProperties.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/rdf/impl/JcrGraphProperties.java index 0bf7d92571..9520e61f59 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/rdf/impl/JcrGraphProperties.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/rdf/impl/JcrGraphProperties.java @@ -49,8 +49,10 @@ public Dataset getProperties(final Node node, final GraphSubjects subjects, final int offset, final int limit) throws RepositoryException { final JcrRdfTools jcrRdfTools = JcrRdfTools.withContext(subjects, node.getSession()); - final Model model = jcrRdfTools.getJcrTriples(node).asModel(); - final Model treeModel = jcrRdfTools.getTreeTriples(node, offset, limit).asModel(); + final Model model = + jcrRdfTools.getJcrTriples(node).concat( + jcrRdfTools.getTreeTriples(node)).limit(limit).skip(offset) + .asModel(); final Model problemModel = JcrRdfTools.getProblemsModel(); final JcrPropertyStatementListener listener = @@ -58,10 +60,9 @@ public Dataset getProperties(final Node node, final GraphSubjects subjects, subjects, node.getSession(), problemModel); model.register(listener); - treeModel.register(listener); final Dataset dataset = DatasetFactory.create(model); - dataset.addNamedModel(MODEL_NAME, treeModel); + dataset.addNamedModel(MODEL_NAME, model); final Resource subject = subjects.getGraphSubject(node); final String uri = subject.getURI(); diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrRdfTools.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrRdfTools.java index c78c53a3a9..9f0c3ad7d1 100644 --- a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrRdfTools.java +++ b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrRdfTools.java @@ -304,13 +304,10 @@ public RdfStream getNamespaceTriples() throws RepositoryException { * the jcr:content of children) to the given {@link RdfStream} * * @param node - * @param offset - * @param limit @throws RepositoryException + * @throws RepositoryException */ - public RdfStream getTreeTriples(final Node node, final int offset, - final int limit) throws RepositoryException { - return new HierarchyRdfContext(node, graphSubjects, llstore).limit( - limit).skip(offset); + public RdfStream getTreeTriples(final Node node) throws RepositoryException { + return new HierarchyRdfContext(node, graphSubjects, llstore); } /** @@ -516,7 +513,7 @@ public String getPropertyNameFromPredicate(final com.hp.hpl.jena.rdf.model.Prope public String getPropertyNameFromPredicate(final com.hp.hpl.jena.rdf.model.Property predicate) throws RepositoryException { - Map emptyNamespaceMapping = emptyMap(); + final Map emptyNamespaceMapping = emptyMap(); return getPropertyNameFromPredicate(predicate, emptyNamespaceMapping); } @@ -604,7 +601,7 @@ public int getPropertyType(final String nodeType, final String propertyName) thr public int getPropertyType(final NodeType nodeType, final String propertyName) throws RepositoryException { final PropertyDefinition[] propertyDefinitions = nodeType.getPropertyDefinitions(); int type = UNDEFINED; - for (PropertyDefinition propertyDefinition : propertyDefinitions) { + for (final PropertyDefinition propertyDefinition : propertyDefinitions) { if (propertyDefinition.getName().equals(propertyName)) { if (type != UNDEFINED) { return UNDEFINED; diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraResourceTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraResourceTest.java index a2134301b6..86faa59df8 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraResourceTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraResourceTest.java @@ -222,7 +222,7 @@ public void testGetPropertiesDataset() throws Exception { when(mockJcrRdfTools.getJcrTriples(mockNode)).thenReturn( propertiesStream); final RdfStream treeStream = new RdfStream(mockTriple); - when(mockJcrRdfTools.getTreeTriples(mockNode, 0, -1)).thenReturn( + when(mockJcrRdfTools.getTreeTriples(mockNode)).thenReturn( treeStream); final Model problemsModel = new RdfStream().asModel(); when(getProblemsModel()).thenReturn(problemsModel); @@ -249,7 +249,7 @@ public void testGetPropertiesDatasetDefaultLimits() final RdfStream propertiesStream = new RdfStream(mockTriple); when(mockJcrRdfTools.getJcrTriples(mockNode)).thenReturn(propertiesStream); final RdfStream treeStream = new RdfStream(mockTriple); - when(mockJcrRdfTools.getTreeTriples(mockNode, 0, -1)).thenReturn(treeStream); + when(mockJcrRdfTools.getTreeTriples(mockNode)).thenReturn(treeStream); final Model problemsModel = createDefaultModel(); when(getProblemsModel()).thenReturn(problemsModel); final Dataset dataset = testObj.getPropertiesDataset(mockSubjects); @@ -334,7 +334,7 @@ public void testReplacePropertiesDataset() throws Exception { when(mockJcrRdfTools.getJcrTriples(mockNode)).thenReturn(propertiesStream); final RdfStream treeStream = new RdfStream(); - when(mockJcrRdfTools.getTreeTriples(mockNode, 0, -2)).thenReturn(treeStream); + when(mockJcrRdfTools.getTreeTriples(mockNode)).thenReturn(treeStream); final Model problemsModel = createDefaultModel(); when(getProblemsModel()).thenReturn(problemsModel); diff --git a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/JcrGraphPropertiesTest.java b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/JcrGraphPropertiesTest.java index 30713f5661..939575f1d7 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/JcrGraphPropertiesTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/JcrGraphPropertiesTest.java @@ -86,7 +86,7 @@ public void testGetPropertiesDataset() throws Exception { when(mockJcrRdfTools.getJcrTriples(mockNode)).thenReturn( propertiesStream); final RdfStream treeStream = new RdfStream(); - when(mockJcrRdfTools.getTreeTriples(mockNode, 0, -1)).thenReturn( + when(mockJcrRdfTools.getTreeTriples(mockNode)).thenReturn( treeStream); final Model problemsModel = createDefaultModel(); when(getProblemsModel()).thenReturn(problemsModel); @@ -116,14 +116,14 @@ public void testGetPropertiesDefaultLimits() when(mockJcrRdfTools.getJcrTriples(mockNode)).thenReturn( propertiesStream); final RdfStream treeStream = new RdfStream(); - when(mockJcrRdfTools.getTreeTriples(mockNode, 0, -1)).thenReturn( + when(mockJcrRdfTools.getTreeTriples(mockNode)).thenReturn( treeStream); final Model problemsModel = createDefaultModel(); when(getProblemsModel()).thenReturn(problemsModel); final Dataset dataset = testObj.getProperties(mockNode, mockSubjects); verifyStatic(); - mockJcrRdfTools.getTreeTriples(mockNode, 0, -1); + mockJcrRdfTools.getTreeTriples(mockNode); assertTrue(dataset.containsNamedModel("tree")); assertEquals(treeStream, RdfStream.fromModel(dataset.getNamedModel("tree"))); @@ -151,7 +151,7 @@ public void testGetPropertiesDatasetDefaults() throws Exception { when(mockJcrRdfTools.getJcrTriples(mockNode)) .thenReturn(propertiesStream); final RdfStream treeStream = new RdfStream(); - when(mockJcrRdfTools.getTreeTriples(mockNode, 0, -1)) + when(mockJcrRdfTools.getTreeTriples(mockNode)) .thenReturn(treeStream); final Model problemsModel = createDefaultModel(); when(getProblemsModel()).thenReturn(problemsModel); 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 index ffe6fcecd0..143482e1e5 100644 --- a/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrRdfToolsTest.java +++ b/fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrRdfToolsTest.java @@ -268,7 +268,7 @@ public final void shouldExcludeBinaryProperties() throws RepositoryException, public final void shouldBeAbleToDisableResourceInlining() throws RepositoryException { - final Model actual = testObj.getTreeTriples(mockNode, 0, -2).asModel(); + final Model actual = testObj.getTreeTriples(mockNode).asModel(); assertEquals(0, Iterators.size(actual.listObjectsOfProperty(actual .createProperty("http://www.w3.org/ns/ldp#inlinedResource")))); verify(mockParent, never()).getProperties(); @@ -292,7 +292,7 @@ public final void shouldIncludeContainerInfoWithMixinTypeContainer() when(mockNode.getDepth()).thenReturn(0); when(mockNodes.hasNext()).thenReturn(false); - final Model actual = testObj.getTreeTriples(mockNode, 0, -1).asModel(); + final Model actual = testObj.getTreeTriples(mockNode).asModel(); assertTrue(actual.contains(testSubjects.getContext(), type, actual .createProperty("http://www.w3.org/ns/ldp#Page"))); @@ -335,7 +335,8 @@ public void shouldIncludeFullChildNodeInformationInsideWindow() when(mockFullChildNode.getProperties()).thenReturn(mockProperties); when(mockProperties.hasNext()).thenReturn(false); when(mockNode.hasNodes()).thenReturn(true); - final Model actual = testObj.getTreeTriples(mockNode, 1, 2).asModel(); + final Model actual = + testObj.getTreeTriples(mockNode).limit(2).asModel(); assertEquals(2, Iterators.size(actual .listSubjectsWithProperty(HAS_PARENT))); verify(mockChildNode, never()).getProperties();