From a6df6e211b6d7bcb24fb47e1e570cf29042719d9 Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Mon, 31 Aug 2020 10:32:56 +0200 Subject: [PATCH] change: split core and wrapper storage configs --- config/config-default.json | 3 +- config/presets/acl.json | 2 +- config/presets/ldp/operation-handler.json | 10 ++--- config/presets/setup.json | 2 +- config/presets/storage.json | 49 +------------------- config/presets/storage_wrapper.json | 54 +++++++++++++++++++++++ 6 files changed, 65 insertions(+), 55 deletions(-) create mode 100644 config/presets/storage_wrapper.json diff --git a/config/config-default.json b/config/config-default.json index cb701ee7d..181b016b1 100644 --- a/config/config-default.json +++ b/config/config-default.json @@ -9,6 +9,7 @@ "files-scs:config/presets/ldp/permissions-extractor.json", "files-scs:config/presets/ldp/request-parser.json", "files-scs:config/presets/setup.json", - "files-scs:config/presets/storage.json" + "files-scs:config/presets/storage.json", + "files-scs:config/presets/storage_wrapper.json" ] } diff --git a/config/presets/acl.json b/config/presets/acl.json index 478b79a1c..391bc1fc7 100644 --- a/config/presets/acl.json +++ b/config/presets/acl.json @@ -15,7 +15,7 @@ "@id": "urn:solid-server:my:UrlContainerManager" }, "SimpleAclAuthorizer:_resourceStore": { - "@id": "urn:solid-server:my:ResourceStore" + "@id": "urn:solid-server:my:ResourceStore_Patching" } } ] diff --git a/config/presets/ldp/operation-handler.json b/config/presets/ldp/operation-handler.json index 8a2b21501..d3bab52fc 100644 --- a/config/presets/ldp/operation-handler.json +++ b/config/presets/ldp/operation-handler.json @@ -8,31 +8,31 @@ { "@type": "SimpleDeleteOperationHandler", "SimpleDeleteOperationHandler:_store": { - "@id": "urn:solid-server:my:ResourceStore" + "@id": "urn:solid-server:my:ResourceStore_Patching" } }, { "@type": "SimpleGetOperationHandler", "SimpleGetOperationHandler:_store": { - "@id": "urn:solid-server:my:ResourceStore" + "@id": "urn:solid-server:my:ResourceStore_Patching" } }, { "@type": "SimplePatchOperationHandler", "SimplePatchOperationHandler:_store": { - "@id": "urn:solid-server:my:ResourceStore" + "@id": "urn:solid-server:my:ResourceStore_Patching" } }, { "@type": "SimplePostOperationHandler", "SimplePostOperationHandler:_store": { - "@id": "urn:solid-server:my:ResourceStore" + "@id": "urn:solid-server:my:ResourceStore_Patching" } }, { "@type": "SimplePutOperationHandler", "SimplePutOperationHandler:_store": { - "@id": "urn:solid-server:my:ResourceStore" + "@id": "urn:solid-server:my:ResourceStore_Patching" } } ] diff --git a/config/presets/setup.json b/config/presets/setup.json index 3b5156f9f..0d54fbcab 100644 --- a/config/presets/setup.json +++ b/config/presets/setup.json @@ -8,7 +8,7 @@ "@id": "urn:solid-server:my:HttpServer" }, "Setup:_store": { - "@id": "urn:solid-server:my:ResourceStore" + "@id": "urn:solid-server:my:ResourceStore_Patching" }, "Setup:_aclManager": { "@id": "urn:solid-server:my:AclManager" diff --git a/config/presets/storage.json b/config/presets/storage.json index 7484c8025..bd52a5b83 100644 --- a/config/presets/storage.json +++ b/config/presets/storage.json @@ -1,55 +1,10 @@ { "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", "@graph": [ - { - "@id": "urn:solid-server:my:ResourceLocker", - "@type": "SingleThreadedResourceLocker" - }, - { "@id": "urn:solid-server:my:ResourceStore", - "@type": "PatchingStore", - "PatchingStore:_source": { - "@id": "urn:solid-server:my:ResourceStore_Converting" - }, - "PatchingStore:_patcher": { - "@id": "urn:solid-server:my:PatchHandler", - "@type": "SimpleSparqlUpdatePatchHandler", - "SimpleSparqlUpdatePatchHandler:_source": { - "@id": "urn:solid-server:my:ResourceStore_Converting" - }, - "SimpleSparqlUpdatePatchHandler:_locker": { - "@id": "urn:solid-server:my:ResourceLocker" - } - } - }, - - { - "@id": "urn:solid-server:my:ResourceStore_Converting", - "@type": "RepresentationConvertingStore", - "RepresentationConvertingStore:_source": { - "@type": "SimpleResourceStore", - "SimpleResourceStore:_runtimeConfig": { - "@id": "urn:solid-server:my:RuntimeConfig" - } - }, - "RepresentationConvertingStore:_converter": { - "@type": "CompositeAsyncHandler", - "CompositeAsyncHandler:_handlers": [ - { - "@type": "RdfToQuadConverter" - }, - { - "@type": "QuadToTurtleConverter" - } - ] - } - }, - - { - "@id": "urn:solid-server:my:UrlContainerManager", - "@type": "UrlContainerManager", - "UrlContainerManager:_runtimeConfig": { + "@type": "SimpleResourceStore", + "SimpleResourceStore:_runtimeConfig": { "@id": "urn:solid-server:my:RuntimeConfig" } } diff --git a/config/presets/storage_wrapper.json b/config/presets/storage_wrapper.json new file mode 100644 index 000000000..ab06fa599 --- /dev/null +++ b/config/presets/storage_wrapper.json @@ -0,0 +1,54 @@ +{ + "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^1.0.0/components/context.jsonld", + "@graph": [ + { + "@id": "urn:solid-server:my:ResourceLocker", + "@type": "SingleThreadedResourceLocker" + }, + + { + "@id": "urn:solid-server:my:ResourceStore_Patching", + "@type": "PatchingStore", + "PatchingStore:_source": { + "@id": "urn:solid-server:my:ResourceStore_Converting" + }, + "PatchingStore:_patcher": { + "@id": "urn:solid-server:my:PatchHandler", + "@type": "SimpleSparqlUpdatePatchHandler", + "SimpleSparqlUpdatePatchHandler:_source": { + "@id": "urn:solid-server:my:ResourceStore_Converting" + }, + "SimpleSparqlUpdatePatchHandler:_locker": { + "@id": "urn:solid-server:my:ResourceLocker" + } + } + }, + + { + "@id": "urn:solid-server:my:ResourceStore_Converting", + "@type": "RepresentationConvertingStore", + "RepresentationConvertingStore:_source": { + "@id": "urn:solid-server:my:ResourceStore" + }, + "RepresentationConvertingStore:_converter": { + "@type": "CompositeAsyncHandler", + "CompositeAsyncHandler:_handlers": [ + { + "@type": "RdfToQuadConverter" + }, + { + "@type": "QuadToTurtleConverter" + } + ] + } + }, + + { + "@id": "urn:solid-server:my:UrlContainerManager", + "@type": "UrlContainerManager", + "UrlContainerManager:_runtimeConfig": { + "@id": "urn:solid-server:my:RuntimeConfig" + } + } + ] +}