Anonymous avatar Anonymous committed 0f8ee5b

Stop escaping RDF content model URI suffix - that wasn't the cause of the problem

Comments (0)

Files changed (4)

chempound-app/src/main/java/net/chempound/DefaultChempound.java

 
         final List<URI> models = new ArrayList<URI>();
         models.add(uri);
-        models.add(uri.resolve("%25rdf"));
+        models.add(uri.resolve("#rdf"));
 
         final List<String> resources = new ArrayList<String>();
         for (final AggregatedResource resource : item.getAggregatedResources()) {

chempound-app/src/main/java/net/chempound/deposit/DepositHandler.java

         final Model model = readRdf(resource, baseUri);
 
         final URI resourceUri = baseUri.resolve(resource.getPath());
-        tripleStore.saveModel(URI.create(resourceUri.toString() + "%25rdf"), model);
+        tripleStore.saveModel(URI.create(resourceUri.toString() + "#rdf"), model);
 
         final byte[] bytes = writeModel(model, "RDF/XML-ABBREV", baseUri.toString());
         final LocalResource rdfResource = new InMemoryResource(resource.getPath(), MimeType.APPLICATION_RDF_XML, bytes);

chempound-app/src/test/java/net/chempound/DefaultChempoundTest.java

         
         chempound.deleteEntity(ITEM_URI);
         
-        verify(tripleStore).deleteModels(asList(ITEM_URI, ITEM_URI.resolve("%25rdf")));
+        verify(tripleStore).deleteModels(asList(ITEM_URI, ITEM_URI.resolve("#rdf")));
     }
 
     @Test
 
         chempound.deleteEntity(ITEM_URI);
 
-        verify(tripleStore).deleteModels(asList(ITEM_URI, ITEM_URI.resolve("%25rdf")));
+        verify(tripleStore).deleteModels(asList(ITEM_URI, ITEM_URI.resolve("#rdf")));
         verify(resourceStore).deleteItems(asList("item/file.txt"));
     }
 
             ResourceFactory.createResource(ROOT_URI.toString())
         ));
 
-        verify(tripleStore).deleteModels(asList(ITEM_URI, ITEM_URI.resolve("%25rdf")));
+        verify(tripleStore).deleteModels(asList(ITEM_URI, ITEM_URI.resolve("#rdf")));
     }
     
     private static class CountingRepositoryListener implements RepositoryListener {

chempound-webapp/src/main/java/net/chempound/webapp/splashpage/SplashPageGenerator.java

         if (!isCollection(model, aggregationUri)) {
             for (final AggregatedResource resource : model.getResource(aggregationUri.toString()).as(Item.class).getAggregatedResources()) {
                 if (MimeType.APPLICATION_RDF_XML.equals(resource.getFormat())) {
-                    final Model contentModel = tripleStore.getModel(URI.create(resource.getURI() + "%25rdf"));
+                    final Model contentModel = tripleStore.getModel(URI.create(resource.getURI() + "#rdf"));
                     if (contentModel != null) {
                         model.add(contentModel);
                     }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.