Skip to content

Commit

Permalink
Collapse #rest-api namespace into #repository
Browse files Browse the repository at this point in the history
- Remove #rels-ext namespace

Partial resolution of: https://www.pivotaltracker.com/story/show/82075356
  • Loading branch information
Andrew Woods committed Nov 9, 2014
1 parent ee47e85 commit b9bfc39
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo</artifactId>
<version>4.0.0-beta-04</version>
<version>4.0.0-beta-04-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
12 changes: 6 additions & 6 deletions src/test/java/org/fcrepo/it/SparqlRecipesIT.java
Expand Up @@ -252,7 +252,7 @@ public void testSparqlQueries2() throws IOException {
new HashSet(new FusekiResponse(new String(response2b.toByteArray()).trim()).getValues("title")));

final String fusekiQuery3e = "select ?obj ?col where" +
" { ?obj <http://fedora.info/definitions/v4/rels-ext#isMemberOfCollection> ?col }";
" { ?obj <http://some-vocabulary.org/rels-ext#isMemberOfCollection> ?col }";
final ByteArrayOutputStream response3e = new ByteArrayOutputStream();
queryFuseki(fusekiQuery3e).getEntity().writeTo(response3e);
final FusekiResponse table = new FusekiResponse(new String(response3e.toByteArray()));
Expand All @@ -263,7 +263,7 @@ public void testSparqlQueries2() throws IOException {
expected.add(Arrays.asList(new String[] {getURIForPid(pidObj3), getURIForPid(pidCol3)}));
Assert.assertEquals(expected, new HashSet<List<String>>(table.rows));

final String fusekiQuery3f = "prefix rels: <http://fedora.info/definitions/v4/rels-ext#>\n" +
final String fusekiQuery3f = "prefix rels: <http://some-vocabulary.org/rels-ext#>\n" +
"select ?obj where {\n" +
" <" + getURIForPid(pidCol1) + "> rels:hasPart* ?col\n" +
" . ?obj rels:isMemberOfCollection ?col\n" +
Expand All @@ -277,7 +277,7 @@ public void testSparqlQueries2() throws IOException {

@Test
public void testSparqlQueries3() throws IOException {
final String fusekiQuery3h = "prefix rels: <http://fedora.info/definitions/v4/rels-ext#>\n" +
final String fusekiQuery3h = "prefix rels: <http://some-vocabulary.org/rels-ext#>\n" +
"prefix ex: <http://example.org/>\n" +
"select ?obj where {\n" +
" { ?obj ex:project <" + getURIForPid(pidProj1) + "> }\n" +
Expand All @@ -293,7 +293,7 @@ public void testSparqlQueries3() throws IOException {

@Test
public void testCountObjectsLinkedToCollectionOrProject() throws IOException {
final String fusekiQuery3h = "prefix rels: <http://fedora.info/definitions/v4/rels-ext#>\n" +
final String fusekiQuery3h = "prefix rels: <http://some-vocabulary.org/rels-ext#>\n" +
"prefix ex: <http://example.org/>\n" +
"select (count(distinct ?obj) as ?count) where {\n" +
" { ?obj ex:project <" + getURIForPid(pidProj1) + "> }\n" +
Expand Down Expand Up @@ -356,15 +356,15 @@ private static void setTitle(final String pid, final String title) throws IOExce

private static void insertIntoCollection(final String pid, final String collectionPid) throws IOException {
final String sparqlUpdate = "insert data { <" + getURIForPid(pid) + ">" +
" <http://fedora.info/definitions/v4/rels-ext#isMemberOfCollection>" +
" <http://some-vocabulary.org/rels-ext#isMemberOfCollection>" +
" <" + getURIForPid(collectionPid) + "> . }";
updateProperties(pid, sparqlUpdate);
}

private static void linkHierarchicalCollections(final String collectionPid,
final String partPid) throws IOException {
final String sparqlUpdate = "insert data { <" + getURIForPid(collectionPid) + ">" +
" <http://fedora.info/definitions/v4/rels-ext#hasPart>" +
" <http://some-vocabulary.org/rels-ext#hasPart>" +
" <" + getURIForPid(partPid) + "> . }";
updateProperties(collectionPid, sparqlUpdate);
}
Expand Down

0 comments on commit b9bfc39

Please sign in to comment.