Navigation Menu

Skip to content

Commit

Permalink
Minor change to JcrRdfTools.getTreeTriples()
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajs6f
ajs6f committed Nov 19, 2013
1 parent 9eaac0f commit 5c8fa63
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 26 deletions.
7 changes: 3 additions & 4 deletions fcrepo-kernel/src/main/java/org/fcrepo/kernel/FedoraResource.java
View file
Expand Up @@ -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();

Expand Down
9 changes: 5 additions & 4 deletions fcrepo-kernel/src/main/java/org/fcrepo/kernel/rdf/impl/JcrGraphProperties.java
View file
Expand Up @@ -49,19 +49,20 @@ 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 =
JcrPropertyStatementListener.getListener(
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();
Expand Down
13 changes: 5 additions & 8 deletions fcrepo-kernel/src/main/java/org/fcrepo/kernel/utils/JcrRdfTools.java
View file
Expand Up @@ -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);
}

/**
Expand Down Expand Up @@ -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<String, String> emptyNamespaceMapping = emptyMap();
final Map<String, String> emptyNamespaceMapping = emptyMap();
return getPropertyNameFromPredicate(predicate, emptyNamespaceMapping);
}

Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions fcrepo-kernel/src/test/java/org/fcrepo/kernel/FedoraResourceTest.java
View file
Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);

Expand Down
8 changes: 4 additions & 4 deletions fcrepo-kernel/src/test/java/org/fcrepo/kernel/rdf/impl/JcrGraphPropertiesTest.java
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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")));

Expand Down Expand Up @@ -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);
Expand Down
7 changes: 4 additions & 3 deletions fcrepo-kernel/src/test/java/org/fcrepo/kernel/utils/JcrRdfToolsTest.java
View file
Expand Up @@ -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();
Expand All @@ -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")));
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit 5c8fa63

Please sign in to comment.