Skip to content

Commit

Permalink
remove unnecessary methods from JcrRdfTools
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbeer
cbeer committed Jul 23, 2013
1 parent 09cb7d8 commit 4326cea
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 150 deletions.
2 changes: 1 addition & 1 deletion fcrepo-kernel/src/main/java/org/fcrepo/FedoraResource.java
View file
Expand Up @@ -299,7 +299,7 @@ public Dataset getVersionDataset(final GraphSubjects subjects)

final Dataset dataset = DatasetFactory.create(model);

String uri = JcrRdfTools.getGraphSubject(subjects, node).getURI();
String uri = subjects.getGraphSubject(node).getURI();
com.hp.hpl.jena.sparql.util.Context context = dataset.getContext();
context.set(GraphProperties.URI_SYMBOL,uri);

Expand Down
2 changes: 1 addition & 1 deletion fcrepo-kernel/src/main/java/org/fcrepo/rdf/impl/JcrGraphProperties.java
View file
Expand Up @@ -58,7 +58,7 @@ public Dataset getProperties(final Node node, final GraphSubjects subjects,
final Dataset dataset = DatasetFactory.create(model);
dataset.addNamedModel(MODEL_NAME, treeModel);

Resource subject = JcrRdfTools.getGraphSubject(subjects, node);
Resource subject = subjects.getGraphSubject(node);
String uri = subject.getURI();
com.hp.hpl.jena.sparql.util.Context context = dataset.getContext();
context.set(URI_SYMBOL,uri);
Expand Down
3 changes: 1 addition & 2 deletions fcrepo-kernel/src/main/java/org/fcrepo/services/DatastreamService.java
View file
Expand Up @@ -22,7 +22,6 @@
import static com.google.common.collect.Sets.difference;
import static org.fcrepo.metrics.RegistryService.getMetrics;
import static org.fcrepo.services.ServiceHelpers.getCheckCacheFixityFunction;
import static org.fcrepo.utils.JcrRdfTools.getGraphSubject;
import static org.modeshape.jcr.api.JcrConstants.JCR_CONTENT;
import static org.slf4j.LoggerFactory.getLogger;

Expand Down Expand Up @@ -190,7 +189,7 @@ public Dataset getFixityResultsModel(final GraphSubjects subjects,
final Dataset dataset = GraphStoreFactory.create(model).toDataset();

final String uri =
getGraphSubject(subjects, datastream.getNode()).getURI();
subjects.getGraphSubject(datastream.getNode()).getURI();
final Context context = dataset.getContext();
context.set(GraphProperties.URI_SYMBOL, uri);

Expand Down
10 changes: 4 additions & 6 deletions fcrepo-kernel/src/main/java/org/fcrepo/utils/JcrPropertyStatementListener.java
View file
Expand Up @@ -18,9 +18,7 @@

import static com.google.common.base.Throwables.propagate;
import static org.fcrepo.utils.JcrRdfTools.createValue;
import static org.fcrepo.utils.JcrRdfTools.getNodeFromGraphSubject;
import static org.fcrepo.utils.JcrRdfTools.getPropertyNameFromPredicate;
import static org.fcrepo.utils.JcrRdfTools.isFedoraGraphSubject;
import static org.fcrepo.utils.NodePropertiesTools.appendOrReplaceNodeProperty;
import static org.fcrepo.utils.NodePropertiesTools.getPropertyType;
import static org.fcrepo.utils.NodePropertiesTools.removeNodeProperty;
Expand Down Expand Up @@ -96,12 +94,12 @@ public void addedStatement(final Statement s) {
final Resource subject = s.getSubject();

// if it's not about a node, ignore it.
if (!isFedoraGraphSubject(subjects, subject)) {
if (!subjects.isFedoraGraphSubject(subject)) {
return;
}

final Node subjectNode =
getNodeFromGraphSubject(subjects, getSession(), subject);
subjects.getNodeFromGraphSubject(getSession(), subject);

// extract the JCR propertyName from the predicate
final String propertyName =
Expand Down Expand Up @@ -133,12 +131,12 @@ public void removedStatement(final Statement s) {
final Resource subject = s.getSubject();

// if it's not about a node, we don't care.
if (!isFedoraGraphSubject(subjects, subject)) {
if (!subjects.isFedoraGraphSubject(subject)) {
return;
}

final Node subjectNode =
getNodeFromGraphSubject(subjects, getSession(), subject);
subjects.getNodeFromGraphSubject(getSession(), subject);

final String propertyName =
getPropertyNameFromPredicate(subjectNode, s.getPredicate());
Expand Down
50 changes: 8 additions & 42 deletions fcrepo-kernel/src/main/java/org/fcrepo/utils/JcrRdfTools.java
View file
Expand Up @@ -149,40 +149,6 @@ public static String getRDFNamespaceForJcrNamespace(
}
}

/**
* Translate a JCR node into an RDF Resource
*
* @param node
* @return an RDF URI resource
* @throws RepositoryException
*/
public static Resource getGraphSubject(final GraphSubjects factory,
final Node node) throws RepositoryException {
return factory.getGraphSubject(node);
}

/**
* Translate an RDF resource into a JCR node
*
* @param session
* @param subject an RDF URI resource
* @return a JCR node, or null if one couldn't be found
* @throws RepositoryException
*/
public static Node getNodeFromGraphSubject(final GraphSubjects factory,
final Session session, final Resource subject)
throws RepositoryException {
return factory.getNodeFromGraphSubject(session, subject);
}

/**
* Predicate for determining whether this {@link Node} is a Fedora object.
*/
public static boolean isFedoraGraphSubject(final GraphSubjects factory,
final Resource subject) {
return factory.isFedoraGraphSubject(subject);
}

/**
* Create a default Jena Model populated with the registered JCR namespaces
*
Expand Down Expand Up @@ -275,7 +241,7 @@ public static Model getJcrNodeIteratorModel(final GraphSubjects factory,
addJcrPropertiesToModel(factory, node, model);
if (iteratorSubject != null) {
model.add(iteratorSubject, RdfLexicon.HAS_MEMBER_OF_RESULT,
getGraphSubject(factory, node));
factory.getGraphSubject(node));
}
}

Expand Down Expand Up @@ -444,12 +410,12 @@ public static Model getJcrTreeModel(final GraphSubjects factory,

final Model model = createDefaultJcrModel(node.getSession());

final Resource subject = getGraphSubject(factory, node);
final Resource subject = factory.getGraphSubject(node);

// don't do this if the node is the root node.
if (node.getDepth() != 0) {
final Node parentNode = node.getParent();
model.add(subject, RdfLexicon.HAS_PARENT, getGraphSubject(factory,
model.add(subject, RdfLexicon.HAS_PARENT, factory.getGraphSubject(
parentNode));
addJcrPropertiesToModel(factory, parentNode, model);
}
Expand All @@ -468,7 +434,7 @@ public static Model getJcrTreeModel(final GraphSubjects factory,
excludedNodeCount++;
} else {
final Resource childNodeSubject =
getGraphSubject(factory, childNode);
factory.getGraphSubject(childNode);

if (i >= offset && (limit == -1 || i < (offset + limit))) {
addJcrPropertiesToModel(factory, childNode, model);
Expand Down Expand Up @@ -498,7 +464,7 @@ public static Model getJcrTreeModel(final GraphSubjects factory,
private static void addJcrPropertiesToModel(final GraphSubjects factory,
final Node node, final Model model) throws RepositoryException {

final Resource subject = getGraphSubject(factory, node);
final Resource subject = factory.getGraphSubject(node);
final javax.jcr.PropertyIterator properties = node.getProperties();

while (properties.hasNext()) {
Expand All @@ -511,7 +477,7 @@ private static void addJcrPropertiesToModel(final GraphSubjects factory,
if (node.hasNode(JcrConstants.JCR_CONTENT)) {
final Node contentNode = node.getNode(JcrConstants.JCR_CONTENT);
final Resource contentSubject =
getGraphSubject(factory, contentNode);
factory.getGraphSubject(contentNode);

model.add(subject, RdfLexicon.HAS_CONTENT, contentSubject);
model.add(contentSubject, RdfLexicon.IS_CONTENT_OF, subject);
Expand Down Expand Up @@ -735,7 +701,7 @@ public static String getPropertyNameFromPredicate(final Node node,
public static Model getJcrVersionsModel(final GraphSubjects factory,
final Node node) throws RepositoryException {

final Resource subject = getGraphSubject(factory, node);
final Resource subject = factory.getGraphSubject(node);

final Model model = createDefaultJcrModel(node.getSession());

Expand All @@ -748,7 +714,7 @@ public static Model getJcrVersionsModel(final GraphSubjects factory,
final Version version = versionIterator.nextVersion();
final Node frozenNode = version.getFrozenNode();
final Resource versionSubject =
getGraphSubject(factory, frozenNode);
factory.getGraphSubject(frozenNode);

model.add(subject, HAS_VERSION, versionSubject);

Expand Down
16 changes: 5 additions & 11 deletions fcrepo-kernel/src/test/java/org/fcrepo/FedoraResourceTest.java
View file
Expand Up @@ -24,7 +24,6 @@
import static org.fcrepo.utils.FedoraJcrTypes.JCR_LASTMODIFIED;
import static org.fcrepo.utils.FedoraTypesUtils.getBaseVersion;
import static org.fcrepo.utils.FedoraTypesUtils.getVersionHistory;
import static org.fcrepo.utils.JcrRdfTools.getGraphSubject;
import static org.fcrepo.utils.JcrRdfTools.getJcrPropertiesModel;
import static org.fcrepo.utils.JcrRdfTools.getJcrTreeModel;
import static org.fcrepo.utils.JcrRdfTools.getJcrVersionsModel;
Expand Down Expand Up @@ -204,7 +203,7 @@ public void testGetPropertiesDataset() throws RepositoryException {
mockStatic(JcrRdfTools.class);
final GraphSubjects mockSubjects = mock(GraphSubjects.class);
final Resource mockResource = new DummyURIResource("info:fedora/xyz");
when(getGraphSubject(mockSubjects, mockNode)).thenReturn(mockResource);
when(mockSubjects.getGraphSubject(mockNode)).thenReturn(mockResource);

final Model propertiesModel = createDefaultModel();
when(getJcrPropertiesModel(mockSubjects, mockNode)).thenReturn(
Expand Down Expand Up @@ -232,7 +231,7 @@ public void testGetPropertiesDatasetDefaultLimits()
mockStatic(JcrRdfTools.class);
final GraphSubjects mockSubjects = mock(GraphSubjects.class);
final Resource mockResource = new DummyURIResource("info:fedora/xyz");
when(getGraphSubject(mockSubjects, mockNode)).thenReturn(mockResource);
when(mockSubjects.getGraphSubject(mockNode)).thenReturn(mockResource);

final Model propertiesModel = createDefaultModel();
when(getJcrPropertiesModel(mockSubjects, mockNode)).thenReturn(
Expand All @@ -256,10 +255,7 @@ public void testGetPropertiesDatasetDefaultLimits()
public void testGetPropertiesDatasetDefaults() throws RepositoryException {

mockStatic(JcrRdfTools.class);
final Resource mockResource = new DummyURIResource("info:fedora/xyz");
when(getGraphSubject(DEFAULT_SUBJECT_FACTORY, mockNode)).thenReturn(
mockResource);

when(mockNode.getPath()).thenReturn("/xyz");
final Model propertiesModel = createDefaultModel();
when(getJcrPropertiesModel(DEFAULT_SUBJECT_FACTORY, mockNode))
.thenReturn(propertiesModel);
Expand All @@ -284,7 +280,7 @@ public void testGetVersionDataset() throws RepositoryException {
mockStatic(JcrRdfTools.class);
final GraphSubjects mockSubjects = mock(GraphSubjects.class);
final Resource mockResource = new DummyURIResource("info:fedora/xyz");
when(getGraphSubject(mockSubjects, mockNode)).thenReturn(mockResource);
when(mockSubjects.getGraphSubject(mockNode)).thenReturn(mockResource);

final Model versionsModel = createDefaultModel();
when(getJcrVersionsModel(mockSubjects, mockNode)).thenReturn(
Expand All @@ -300,10 +296,8 @@ public void testGetVersionDataset() throws RepositoryException {
public void testGetVersionDatasetDefaultSubject()
throws RepositoryException {

when(mockNode.getPath()).thenReturn("/xyz");
mockStatic(JcrRdfTools.class);
final Resource mockResource = new DummyURIResource("info:fedora/xyz");
when(getGraphSubject(DEFAULT_SUBJECT_FACTORY, mockNode)).thenReturn(
mockResource);

final Model versionsModel = createDefaultModel();
when(getJcrVersionsModel(DEFAULT_SUBJECT_FACTORY, mockNode))
Expand Down
6 changes: 3 additions & 3 deletions fcrepo-kernel/src/test/java/org/fcrepo/rdf/impl/JcrGraphPropertiesTest.java
View file
Expand Up @@ -73,7 +73,7 @@ public void testGetPropertiesDataset() throws RepositoryException {

mockStatic(JcrRdfTools.class);
final Resource mockResource = new DummyURIResource("info:fedora/xyz");
when(JcrRdfTools.getGraphSubject(mockSubjects, mockNode)).thenReturn(mockResource);
when(mockSubjects.getGraphSubject(mockNode)).thenReturn(mockResource);

final Model propertiesModel = createDefaultModel();
when(JcrRdfTools.getJcrPropertiesModel(mockSubjects, mockNode)).thenReturn(
Expand Down Expand Up @@ -101,7 +101,7 @@ public void testGetPropertiesDefaultLimits()

mockStatic(JcrRdfTools.class);
final Resource mockResource = new DummyURIResource("info:fedora/xyz");
when(JcrRdfTools.getGraphSubject(mockSubjects, mockNode)).thenReturn(mockResource);
when(mockSubjects.getGraphSubject(mockNode)).thenReturn(mockResource);

final Model propertiesModel = createDefaultModel();
when(JcrRdfTools.getJcrPropertiesModel(mockSubjects, mockNode)).thenReturn(
Expand Down Expand Up @@ -132,7 +132,7 @@ public void testGetPropertiesDatasetDefaults() throws RepositoryException {
mockStatic(JcrRdfTools.class);

final Resource mockResource = new DummyURIResource("info:fedora/xyz");
when(JcrRdfTools.getGraphSubject(mockSubjects, mockNode)).thenReturn(
when(mockSubjects.getGraphSubject(mockNode)).thenReturn(
mockResource);

final Model propertiesModel = createDefaultModel();
Expand Down
3 changes: 1 addition & 2 deletions fcrepo-kernel/src/test/java/org/fcrepo/services/DatastreamServiceTest.java
View file
Expand Up @@ -21,7 +21,6 @@
import static org.fcrepo.services.ServiceHelpers.getCheckCacheFixityFunction;
import static org.fcrepo.utils.FedoraTypesUtils.getBinary;
import static org.fcrepo.utils.JcrRdfTools.getFixityResultsModel;
import static org.fcrepo.utils.JcrRdfTools.getGraphSubject;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentCaptor.forClass;
Expand Down Expand Up @@ -199,7 +198,7 @@ public void testGetFixityResultsModel() throws RepositoryException,
getFixityResultsModel(eq(mockSubjects), eq(mockNode),
any(Collection.class))).thenReturn(mockModel);

when(getGraphSubject(mockSubjects, mockNode)).thenReturn(
when(mockSubjects.getGraphSubject(mockNode)).thenReturn(
createResource("abc"));
final Dataset fixityResultsModel =
testObj.getFixityResultsModel(mockSubjects, mockDatastream);
Expand Down

0 comments on commit 4326cea

Please sign in to comment.