Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rename classes and make the triple-providers create their own models
- Loading branch information
Showing
9 changed files
with
111 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 0 additions & 12 deletions
12
fcrepo-http-commons/src/main/java/org/fcrepo/api/rdf/HttpComponentAppender.java
This file was deleted.
Oops, something went wrong.
47 changes: 0 additions & 47 deletions
47
fcrepo-http-commons/src/main/java/org/fcrepo/api/rdf/HttpComponentInjector.java
This file was deleted.
Oops, something went wrong.
58 changes: 58 additions & 0 deletions
58
fcrepo-http-commons/src/main/java/org/fcrepo/api/rdf/HttpTripleUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package org.fcrepo.api.rdf; | ||
|
|
||
| import com.hp.hpl.jena.query.Dataset; | ||
| import com.hp.hpl.jena.rdf.model.Model; | ||
| import org.fcrepo.FedoraResource; | ||
| import org.fcrepo.rdf.GraphSubjects; | ||
| import org.slf4j.Logger; | ||
| import org.springframework.beans.BeansException; | ||
| import org.springframework.context.ApplicationContext; | ||
| import org.springframework.context.ApplicationContextAware; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| import javax.jcr.RepositoryException; | ||
| import javax.ws.rs.core.UriInfo; | ||
| import java.util.Map; | ||
|
|
||
| import static org.slf4j.LoggerFactory.getLogger; | ||
|
|
||
| /** | ||
| * Utility for injecting HTTP-contextual data into a Dataset | ||
| */ | ||
| @Component | ||
| public class HttpTripleUtil implements ApplicationContextAware { | ||
| private static final Logger LOGGER = getLogger(HttpTripleUtil.class); | ||
| private ApplicationContext applicationContext; | ||
|
|
||
| @Override | ||
| public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { | ||
| this.applicationContext = applicationContext; | ||
| } | ||
|
|
||
| /** | ||
| * Add additional models to the RDF dataset for the given resource | ||
| * @param dataset the source dataset we'll add named models to | ||
| * @param resource the FedoraResource in question | ||
| * @param uriInfo a JAX-RS UriInfo object to build URIs to resources | ||
| * @param graphSubjects | ||
| * @throws RepositoryException | ||
| */ | ||
| public void addHttpComponentModelsForResource(Dataset dataset, FedoraResource resource, UriInfo uriInfo, GraphSubjects graphSubjects) throws RepositoryException { | ||
|
|
||
| LOGGER.debug("Adding additional HTTP context triples to dataset"); | ||
| for (final Map.Entry<String, UriAwareResourceModelFactory> e : getUriAwareTripleFactories().entrySet()) { | ||
| final String beanName = e.getKey(); | ||
| final UriAwareResourceModelFactory uriAwareResourceModelFactory = e.getValue(); | ||
| LOGGER.debug("Adding response information using {}", beanName); | ||
|
|
||
| final Model m = uriAwareResourceModelFactory.createModelForResource(resource, uriInfo, graphSubjects); | ||
| dataset.addNamedModel(beanName, m); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| private Map<String, UriAwareResourceModelFactory> getUriAwareTripleFactories() { | ||
| return applicationContext.getBeansOfType(UriAwareResourceModelFactory.class); | ||
|
|
||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
fcrepo-http-commons/src/main/java/org/fcrepo/api/rdf/UriAwareResourceModelFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package org.fcrepo.api.rdf; | ||
|
|
||
| import com.hp.hpl.jena.rdf.model.Model; | ||
| import org.fcrepo.FedoraResource; | ||
| import org.fcrepo.rdf.GraphSubjects; | ||
|
|
||
| import javax.jcr.RepositoryException; | ||
| import javax.ws.rs.core.UriInfo; | ||
|
|
||
| /** | ||
| * Helper to generate an RDF model for a FedoraResource that (likely) creates relations | ||
| * from our resource to other HTTP components | ||
| */ | ||
| public interface UriAwareResourceModelFactory { | ||
| Model createModelForResource(final FedoraResource resource, final UriInfo uriInfo, GraphSubjects graphSubjects) throws RepositoryException; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 7 additions & 3 deletions
10
fcrepo-rss/src/main/java/org/fcrepo/syndication/RssResources.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,26 @@ | ||
| package org.fcrepo.syndication; | ||
|
|
||
| import com.hp.hpl.jena.rdf.model.Model; | ||
| import com.hp.hpl.jena.rdf.model.ModelFactory; | ||
| import com.hp.hpl.jena.rdf.model.Resource; | ||
| import org.fcrepo.FedoraResource; | ||
| import org.fcrepo.api.rdf.HttpComponentAppender; | ||
| import org.fcrepo.api.rdf.UriAwareResourceModelFactory; | ||
| import org.fcrepo.rdf.GraphSubjects; | ||
|
|
||
| import javax.jcr.RepositoryException; | ||
| import javax.ws.rs.core.UriInfo; | ||
|
|
||
| public class RssResources implements HttpComponentAppender { | ||
| public class RssResources implements UriAwareResourceModelFactory { | ||
| @Override | ||
| public void addResponseInformationToDataset(FedoraResource resource, Model model, UriInfo uriInfo, GraphSubjects graphSubjects) throws RepositoryException { | ||
| public Model createModelForResource(FedoraResource resource, UriInfo uriInfo, GraphSubjects graphSubjects) throws RepositoryException { | ||
|
|
||
| final Model model = ModelFactory.createDefaultModel(); | ||
| final Resource s = graphSubjects.getGraphSubject(resource.getNode()); | ||
|
|
||
| if (resource.getNode().getPrimaryNodeType().isNodeType("mode:root")) { | ||
| model.add(s, model.createProperty("http://www.whatwg.org/specs/web-apps/current-work/multipage/history.html#link-type-feed"), model.createResource(uriInfo.getBaseUriBuilder().path(RSSPublisher.class).build().toASCIIString())); | ||
| } | ||
|
|
||
| return model; | ||
| } | ||
| } |
11 changes: 7 additions & 4 deletions
11
fcrepo-webhooks/src/main/java/org/fcrepo/webhooks/WebhooksResources.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,25 @@ | ||
| package org.fcrepo.webhooks; | ||
|
|
||
| import com.hp.hpl.jena.rdf.model.Model; | ||
| import com.hp.hpl.jena.rdf.model.ModelFactory; | ||
| import com.hp.hpl.jena.rdf.model.Resource; | ||
| import org.fcrepo.FedoraResource; | ||
| import org.fcrepo.api.rdf.HttpComponentAppender; | ||
| import org.fcrepo.api.rdf.UriAwareResourceModelFactory; | ||
| import org.fcrepo.rdf.GraphSubjects; | ||
|
|
||
| import javax.jcr.RepositoryException; | ||
| import javax.ws.rs.core.UriInfo; | ||
|
|
||
| public class WebhooksResources implements HttpComponentAppender { | ||
| public class WebhooksResources implements UriAwareResourceModelFactory { | ||
| @Override | ||
| public void addResponseInformationToDataset(FedoraResource resource, Model model, UriInfo uriInfo, GraphSubjects graphSubjects) throws RepositoryException { | ||
|
|
||
| public Model createModelForResource(FedoraResource resource, UriInfo uriInfo, GraphSubjects graphSubjects) throws RepositoryException { | ||
| final Model model = ModelFactory.createDefaultModel(); | ||
| final Resource s = graphSubjects.getGraphSubject(resource.getNode()); | ||
|
|
||
| if (resource.getNode().getPrimaryNodeType().isNodeType("mode:root")) { | ||
| model.add(s, model.createProperty("http://microformats.org/wiki/rel-subscription"), model.createResource(uriInfo.getBaseUriBuilder().path(FedoraWebhooks.class).build().toASCIIString())); | ||
| } | ||
|
|
||
| return model; | ||
| } | ||
| } |