From 420e497ad76db201e06921f0f01e0629480c4786 Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Tue, 27 Apr 2021 12:17:59 +0200 Subject: [PATCH] feat: shorten properties in configs --- config/config-default.json | 2 +- config/config-file-subdomains.json | 2 +- config/config-file.json | 2 +- config/config-memory-subdomains.json | 2 +- config/config-sparql-endpoint.json | 2 +- config/presets/acl.json | 26 ++++---- config/presets/http.json | 12 ++-- .../identifiers/subdomain-identifiers.json | 4 +- .../identifiers/suffix-identifiers.json | 4 +- config/presets/init.json | 18 +++--- config/presets/ldp.json | 12 ++-- config/presets/ldp/credentials-extractor.json | 4 +- config/presets/ldp/metadata-handler.json | 2 +- config/presets/ldp/operation-handler.json | 14 ++--- config/presets/ldp/permissions-extractor.json | 4 +- config/presets/ldp/request-parser.json | 12 ++-- config/presets/ldp/response-writer.json | 12 ++-- config/presets/ldp/websockets.json | 2 +- config/presets/logging.json | 2 +- config/presets/middleware.json | 12 ++-- config/presets/pod-dynamic.json | 60 +++++++++---------- config/presets/pod-management.json | 22 +++---- config/presets/representation-conversion.json | 10 ++-- config/presets/storage-wrapper.json | 44 +++++++------- .../storage-filesystem-subdomains.json | 18 +++--- .../storage/backend/storage-filesystem.json | 16 ++--- .../storage/backend/storage-memory.json | 8 +-- .../backend/storage-sparql-endpoint.json | 16 ++--- .../storage/routing/quad-type-routing.json | 10 ++-- .../storage/routing/regex-routing.json | 4 +- config/templates/storage-defaults.json | 10 ++-- config/templates/storage-filesystem.json | 10 ++-- config/templates/storage-memory.json | 2 +- 33 files changed, 190 insertions(+), 190 deletions(-) diff --git a/config/config-default.json b/config/config-default.json index 2d000847d..1a3133a00 100644 --- a/config/config-default.json +++ b/config/config-default.json @@ -27,7 +27,7 @@ "comment": "Use a memory based store as backend with no additional routing.", "@id": "urn:solid-server:default:RoutingResourceStore", "@type": "PassthroughStore", - "PassthroughStore:_source": { + "source": { "@id": "urn:solid-server:default:MemoryResourceStore" } } diff --git a/config/config-file-subdomains.json b/config/config-file-subdomains.json index 03419475f..f692c03c8 100644 --- a/config/config-file-subdomains.json +++ b/config/config-file-subdomains.json @@ -27,7 +27,7 @@ "comment": "Use a file based store as backend with no additional routing.", "@id": "urn:solid-server:default:RoutingResourceStore", "@type": "PassthroughStore", - "PassthroughStore:_source": { + "source": { "@id": "urn:solid-server:default:FileResourceStore" } } diff --git a/config/config-file.json b/config/config-file.json index 6424a5b36..754a7b340 100644 --- a/config/config-file.json +++ b/config/config-file.json @@ -27,7 +27,7 @@ "comment": "Use a file based store as backend with no additional routing.", "@id": "urn:solid-server:default:RoutingResourceStore", "@type": "PassthroughStore", - "PassthroughStore:_source": { + "source": { "@id": "urn:solid-server:default:FileResourceStore" } } diff --git a/config/config-memory-subdomains.json b/config/config-memory-subdomains.json index 18dc33553..41827dad9 100644 --- a/config/config-memory-subdomains.json +++ b/config/config-memory-subdomains.json @@ -27,7 +27,7 @@ "comment": "Use a memory based store as backend with no additional routing.", "@id": "urn:solid-server:default:RoutingResourceStore", "@type": "PassthroughStore", - "PassthroughStore:_source": { + "source": { "@id": "urn:solid-server:default:MemoryResourceStore" } } diff --git a/config/config-sparql-endpoint.json b/config/config-sparql-endpoint.json index cc87cba1b..94ca7d054 100644 --- a/config/config-sparql-endpoint.json +++ b/config/config-sparql-endpoint.json @@ -27,7 +27,7 @@ "comment": "Use a SPARQL based store as backend with no additional routing.", "@id": "urn:solid-server:default:RoutingResourceStore", "@type": "PassthroughStore", - "PassthroughStore:_source": { + "source": { "@id": "urn:solid-server:default:SparqlResourceStore" } } diff --git a/config/presets/acl.json b/config/presets/acl.json index e4c7d568c..4f40030cf 100644 --- a/config/presets/acl.json +++ b/config/presets/acl.json @@ -4,38 +4,38 @@ { "@id": "urn:solid-server:default:AclIdentifierStrategy", "@type": "SuffixAuxiliaryIdentifierStrategy", - "SuffixAuxiliaryIdentifierStrategy:_suffix": ".acl" + "suffix": ".acl" }, { "@id": "urn:solid-server:default:AclStrategy", "@type": "ComposedAuxiliaryStrategy", - "ComposedAuxiliaryStrategy:_identifierStrategy": { + "identifierStrategy": { "@id": "urn:solid-server:default:AclIdentifierStrategy" }, - "ComposedAuxiliaryStrategy:_metadataGenerator": { + "metadataGenerator": { "@type": "LinkMetadataGenerator", - "LinkMetadataGenerator:_link": "http://www.w3.org/ns/auth/acl#accessControl", - "LinkMetadataGenerator:_identifierStrategy": { + "link": "http://www.w3.org/ns/auth/acl#accessControl", + "identifierStrategy": { "@id": "urn:solid-server:default:AclIdentifierStrategy" } }, - "ComposedAuxiliaryStrategy:_validator": { + "validator": { "@id": "urn:solid-server:default:RdfValidator" }, - "ComposedAuxiliaryStrategy:_isRootRequired": true + "isRootRequired": true }, { "@id": "urn:solid-server:default:AclBasedAuthorizer", "@type": "WaterfallHandler", - "WaterfallHandler:_handlers": [ + "handlers": [ { "comment": "This authorizer makes sure that for auxiliary resources, the main authorizer gets called with the associated identifier.", "@type": "AuxiliaryAuthorizer", - "AuxiliaryAuthorizer:_resourceAuthorizer": { + "resourceAuthorizer": { "@id": "urn:solid-server:default:WebAclAuthorizer" }, - "AuxiliaryAuthorizer:_auxStrategy": { + "auxStrategy": { "@id": "urn:solid-server:default:AuxiliaryStrategy" } }, @@ -48,13 +48,13 @@ { "@id": "urn:solid-server:default:WebAclAuthorizer", "@type": "WebAclAuthorizer", - "WebAclAuthorizer:_aclStrategy": { + "aclStrategy": { "@id": "urn:solid-server:default:AclIdentifierStrategy" }, - "WebAclAuthorizer:_resourceStore": { + "resourceStore": { "@id": "urn:solid-server:default:ResourceStore" }, - "WebAclAuthorizer:_identifierStrategy": { + "identifierStrategy": { "@id": "urn:solid-server:default:IdentifierStrategy" } } diff --git a/config/presets/http.json b/config/presets/http.json index c97d33bcf..a29783db7 100644 --- a/config/presets/http.json +++ b/config/presets/http.json @@ -4,30 +4,30 @@ { "@id": "urn:solid-server:default:ServerFactory", "@type": "WebSocketServerFactory", - "WebSocketServerFactory:_baseServerFactory": { + "baseServerFactory": { "@id": "urn:solid-server:default:HttpServerFactory" }, - "WebSocketServerFactory:_webSocketHandler": { + "webSocketHandler": { "@id": "urn:solid-server:default:WebSocketHandler" } }, { "@id": "urn:solid-server:default:HttpServerFactory", "@type": "BaseHttpServerFactory", - "BaseHttpServerFactory:_handler": { + "handler": { "@id": "urn:solid-server:default:HttpHandler" } }, { "@id": "urn:solid-server:default:HttpHandler", "@type": "SequenceHandler", - "SequenceHandler:_handlers": [ + "handlers": [ { "@id": "urn:solid-server:default:Middleware" }, { "@type": "WaterfallHandler", - "WaterfallHandler:_handlers": [ + "handlers": [ { "@id": "urn:solid-server:default:FaviconHandler" }, @@ -48,7 +48,7 @@ "@id": "urn:solid-server:default:FaviconHandler", "@type": "StaticAssetHandler", "comment": "Serves the favicon", - "StaticAssetHandler:_assets": [ + "assets": [ { "StaticAssetHandler:_assets_key": "/favicon.ico", "StaticAssetHandler:_assets_value": "$PACKAGE_ROOT/templates/root/favicon.ico" diff --git a/config/presets/identifiers/subdomain-identifiers.json b/config/presets/identifiers/subdomain-identifiers.json index f92223e4d..c6f1c6d8a 100644 --- a/config/presets/identifiers/subdomain-identifiers.json +++ b/config/presets/identifiers/subdomain-identifiers.json @@ -4,14 +4,14 @@ { "@id": "urn:solid-server:default:IdentifierStrategy", "@type": "SubdomainIdentifierStrategy", - "SubdomainIdentifierStrategy:_baseUrl": { + "baseUrl": { "@id": "urn:solid-server:default:variable:baseUrl" } }, { "@id": "urn:solid-server:default:IdentifierGenerator", "@type": "SubdomainIdentifierGenerator", - "SubdomainIdentifierGenerator:_baseUrl": { + "baseUrl": { "@id": "urn:solid-server:default:variable:baseUrl" } } diff --git a/config/presets/identifiers/suffix-identifiers.json b/config/presets/identifiers/suffix-identifiers.json index 3285a0f56..de891d7e7 100644 --- a/config/presets/identifiers/suffix-identifiers.json +++ b/config/presets/identifiers/suffix-identifiers.json @@ -4,14 +4,14 @@ { "@id": "urn:solid-server:default:IdentifierStrategy", "@type": "SingleRootIdentifierStrategy", - "SingleRootIdentifierStrategy:_baseUrl": { + "baseUrl": { "@id": "urn:solid-server:default:variable:baseUrl" } }, { "@id": "urn:solid-server:default:IdentifierGenerator", "@type": "SuffixIdentifierGenerator", - "SuffixIdentifierGenerator:_base": { + "base": { "@id": "urn:solid-server:default:variable:baseUrl" } } diff --git a/config/presets/init.json b/config/presets/init.json index e239ed3af..6561f5264 100644 --- a/config/presets/init.json +++ b/config/presets/init.json @@ -4,44 +4,44 @@ { "@id": "urn:solid-server:default:Initializer", "@type": "SequenceHandler", - "SequenceHandler:_handlers": [ + "handlers": [ { "@id": "urn:solid-server:default:LoggerInitializer", "@type": "LoggerInitializer", - "LoggerInitializer:_loggerFactory": { + "loggerFactory": { "@id": "urn:solid-server:default:LoggerFactory" } }, { "@id": "urn:solid-server:default:RootContainerInitializer", "@type": "RootContainerInitializer", - "RootContainerInitializer:_settings_store": { + "settings_store": { "@id": "urn:solid-server:default:ResourceStore" }, - "RootContainerInitializer:_settings_baseUrl": { + "settings_baseUrl": { "@id": "urn:solid-server:default:variable:baseUrl" } }, { "@id": "urn:solid-server:default:AclInitializer", "@type": "AclInitializer", - "AclInitializer:_settings_store": { + "settings_store": { "@id": "urn:solid-server:default:ResourceStore" }, - "AclInitializer:_settings_aclStrategy": { + "settings_aclStrategy": { "@id": "urn:solid-server:default:AclIdentifierStrategy" }, - "AclInitializer:_settings_baseUrl": { + "settings_baseUrl": { "@id": "urn:solid-server:default:variable:baseUrl" } }, { "@id": "urn:solid-server:default:ServerInitializer", "@type": "ServerInitializer", - "ServerInitializer:_serverFactory": { + "serverFactory": { "@id": "urn:solid-server:default:ServerFactory" }, - "ServerInitializer:_port": { + "port": { "@id": "urn:solid-server:default:variable:port" } } diff --git a/config/presets/ldp.json b/config/presets/ldp.json index cbd65f07a..1716c4f53 100644 --- a/config/presets/ldp.json +++ b/config/presets/ldp.json @@ -4,22 +4,22 @@ { "@id": "urn:solid-server:default:LdpHandler", "@type": "AuthenticatedLdpHandler", - "AuthenticatedLdpHandler:_args_requestParser": { + "args_requestParser": { "@id": "urn:solid-server:default:RequestParser" }, - "AuthenticatedLdpHandler:_args_credentialsExtractor": { + "args_credentialsExtractor": { "@id": "urn:solid-server:default:CredentialsExtractor" }, - "AuthenticatedLdpHandler:_args_permissionsExtractor": { + "args_permissionsExtractor": { "@id": "urn:solid-server:default:PermissionsExtractor" }, - "AuthenticatedLdpHandler:_args_authorizer": { + "args_authorizer": { "@id": "urn:solid-server:default:AclBasedAuthorizer" }, - "AuthenticatedLdpHandler:_args_operationHandler": { + "args_operationHandler": { "@id": "urn:solid-server:default:OperationHandler" }, - "AuthenticatedLdpHandler:_args_responseWriter": { + "args_responseWriter": { "@id": "urn:solid-server:default:ResponseWriter" } } diff --git a/config/presets/ldp/credentials-extractor.json b/config/presets/ldp/credentials-extractor.json index 40b456456..016eea190 100644 --- a/config/presets/ldp/credentials-extractor.json +++ b/config/presets/ldp/credentials-extractor.json @@ -4,10 +4,10 @@ { "@id": "urn:solid-server:default:CredentialsExtractor", "@type": "WaterfallHandler", - "WaterfallHandler:_handlers": [ + "handlers": [ { "@type": "DPoPWebIdExtractor", - "DPoPWebIdExtractor:_originalUrlExtractor": { + "originalUrlExtractor": { "@type": "OriginalUrlExtractor" } }, diff --git a/config/presets/ldp/metadata-handler.json b/config/presets/ldp/metadata-handler.json index 4bbca08cb..19692c9b4 100644 --- a/config/presets/ldp/metadata-handler.json +++ b/config/presets/ldp/metadata-handler.json @@ -4,7 +4,7 @@ { "@id": "urn:solid-server:default:MetadataExtractor", "@type": "BasicMetadataExtractor", - "BasicMetadataExtractor:_parsers": [ + "parsers": [ { "@type": "ContentTypeParser" }, diff --git a/config/presets/ldp/operation-handler.json b/config/presets/ldp/operation-handler.json index 9873521e3..b6c261e91 100644 --- a/config/presets/ldp/operation-handler.json +++ b/config/presets/ldp/operation-handler.json @@ -4,40 +4,40 @@ { "@id": "urn:solid-server:default:OperationHandler", "@type": "WaterfallHandler", - "WaterfallHandler:_handlers": [ + "handlers": [ { "@type": "DeleteOperationHandler", - "DeleteOperationHandler:_store": { + "store": { "@id": "urn:solid-server:default:ResourceStore" } }, { "@type": "GetOperationHandler", - "GetOperationHandler:_store": { + "store": { "@id": "urn:solid-server:default:ResourceStore" } }, { "@type": "HeadOperationHandler", - "HeadOperationHandler:_store": { + "store": { "@id": "urn:solid-server:default:ResourceStore" } }, { "@type": "PatchOperationHandler", - "PatchOperationHandler:_store": { + "store": { "@id": "urn:solid-server:default:ResourceStore" } }, { "@type": "PostOperationHandler", - "PostOperationHandler:_store": { + "store": { "@id": "urn:solid-server:default:ResourceStore" } }, { "@type": "PutOperationHandler", - "PutOperationHandler:_store": { + "store": { "@id": "urn:solid-server:default:ResourceStore" } } diff --git a/config/presets/ldp/permissions-extractor.json b/config/presets/ldp/permissions-extractor.json index 54aeb4d5c..647b9f359 100644 --- a/config/presets/ldp/permissions-extractor.json +++ b/config/presets/ldp/permissions-extractor.json @@ -4,10 +4,10 @@ { "@id": "urn:solid-server:default:PermissionsExtractor", "@type": "WaterfallHandler", - "WaterfallHandler:_handlers": [ + "handlers": [ { "@type": "AclPermissionsExtractor", - "AclPermissionsExtractor:_aclStrategy": { + "aclStrategy": { "@id": "urn:solid-server:default:AclIdentifierStrategy" } }, diff --git a/config/presets/ldp/request-parser.json b/config/presets/ldp/request-parser.json index 80c253aef..6129013f5 100644 --- a/config/presets/ldp/request-parser.json +++ b/config/presets/ldp/request-parser.json @@ -4,18 +4,18 @@ { "@id": "urn:solid-server:default:RequestParser", "@type": "BasicRequestParser", - "BasicRequestParser:_args_targetExtractor": { + "args_targetExtractor": { "@id": "urn:solid-server:default:TargetExtractor" }, - "BasicRequestParser:_args_preferenceParser": { + "args_preferenceParser": { "@type": "AcceptPreferenceParser" }, - "BasicRequestParser:_args_metadataExtractor": { + "args_metadataExtractor": { "@id": "urn:solid-server:default:MetadataExtractor" }, - "BasicRequestParser:_args_bodyParser": { + "args_bodyParser": { "@type": "WaterfallHandler", - "WaterfallHandler:_handlers": [ + "handlers": [ { "@type": "SparqlUpdateBodyParser" }, @@ -28,7 +28,7 @@ { "@id": "urn:solid-server:default:TargetExtractor", "@type": "OriginalUrlExtractor", - "OriginalUrlExtractor:_options_includeQueryString": false + "options_includeQueryString": false } ] } diff --git a/config/presets/ldp/response-writer.json b/config/presets/ldp/response-writer.json index 050a5bf07..74a29083c 100644 --- a/config/presets/ldp/response-writer.json +++ b/config/presets/ldp/response-writer.json @@ -4,10 +4,10 @@ { "@id": "urn:solid-server:default:MetadataSerializer", "@type": "ParallelHandler", - "ParallelHandler:_handlers": [ + "handlers": [ { "@type": "ConstantMetadataWriter", - "ConstantMetadataWriter:_headers": [ + "headers": [ { "ConstantMetadataWriter:_headers_key": "Accept-Patch", "ConstantMetadataWriter:_headers_value": "application/sparql-update" @@ -20,7 +20,7 @@ }, { "@type": "MappedMetadataWriter", - "MappedMetadataWriter:_headerMap": [ + "headerMap": [ { "MappedMetadataWriter:_headerMap_key": "http://www.w3.org/ns/ma-ont#format", "MappedMetadataWriter:_headerMap_value": "Content-Type" @@ -33,7 +33,7 @@ }, { "@type": "LinkRelMetadataWriter", - "LinkRelMetadataWriter:_linkRelMap": [ + "linkRelMap": [ { "LinkRelMetadataWriter:_linkRelMap_key": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type", "LinkRelMetadataWriter:_linkRelMap_value": "type" @@ -52,13 +52,13 @@ { "@id": "urn:solid-server:default:ResponseWriter", "@type": "WaterfallHandler", - "WaterfallHandler:_handlers": [ + "handlers": [ { "@type": "ErrorResponseWriter" }, { "@type": "BasicResponseWriter", - "BasicResponseWriter:_metadataWriter": { + "metadataWriter": { "@id": "urn:solid-server:default:MetadataSerializer" } } diff --git a/config/presets/ldp/websockets.json b/config/presets/ldp/websockets.json index 9de15f77f..803341409 100644 --- a/config/presets/ldp/websockets.json +++ b/config/presets/ldp/websockets.json @@ -4,7 +4,7 @@ { "@id": "urn:solid-server:default:WebSocketHandler", "@type": "UnsecureWebSocketsProtocol", - "UnsecureWebSocketsProtocol:_source": { + "source": { "@id": "urn:solid-server:default:ResourceStore" } } diff --git a/config/presets/logging.json b/config/presets/logging.json index 685251c4e..f5088f315 100644 --- a/config/presets/logging.json +++ b/config/presets/logging.json @@ -4,7 +4,7 @@ { "@id": "urn:solid-server:default:LoggerFactory", "@type": "WinstonLoggerFactory", - "WinstonLoggerFactory:_level": { + "level": { "@id": "urn:solid-server:default:variable:loggingLevel" } } diff --git a/config/presets/middleware.json b/config/presets/middleware.json index 44b26222d..1ee2abea5 100644 --- a/config/presets/middleware.json +++ b/config/presets/middleware.json @@ -4,10 +4,10 @@ { "@id": "urn:solid-server:default:Middleware", "@type": "SequenceHandler", - "SequenceHandler:_handlers": [ + "handlers": [ { "@type": "HeaderHandler", - "HeaderHandler:_headers": [ + "headers": [ { "HeaderHandler:_headers_key": "Vary", "HeaderHandler:_headers_value": "Accept,Authorization,Origin" @@ -20,13 +20,13 @@ }, { "@type": "WebSocketAdvertiser", - "WebSocketAdvertiser:_baseUrl": { + "baseUrl": { "@id": "urn:solid-server:default:variable:baseUrl" } }, { "@type": "CorsHandler", - "CorsHandler:_options_methods": [ + "options_methods": [ "GET", "HEAD", "OPTIONS", @@ -35,8 +35,8 @@ "PATCH", "DELETE" ], - "CorsHandler:_options_credentials": true, - "CorsHandler:_options_exposedHeaders": [ + "options_credentials": true, + "options_exposedHeaders": [ "Accept-Patch", "Location", "MS-Author-Via", diff --git a/config/presets/pod-dynamic.json b/config/presets/pod-dynamic.json index 5fbd3b909..cb6c55b26 100644 --- a/config/presets/pod-dynamic.json +++ b/config/presets/pod-dynamic.json @@ -8,17 +8,17 @@ { "@id": "urn:solid-server:default:PodConfigurationStorage", "@type": "JsonFileStorage", - "JsonFileStorage:_filePath": { + "filePath": { "@id": "urn:solid-server:default:variable:podConfigJson" }, - "JsonFileStorage:_locker": { + "locker": { "@id": "urn:solid-server:default:ResourceLocker" } }, { "@id": "urn:solid-server:default:PodRoutingStorage", "@type": "ResourceIdentifierStorage", - "ResourceIdentifierStorage:_source": { + "source": { "@type": "MemoryMapStorage" } }, @@ -31,32 +31,32 @@ { "@id": "urn:solid-server:default:PodGenerator", "@type": "TemplatedPodGenerator", - "TemplatedPodGenerator:_storeFactory": { + "storeFactory": { "@id": "urn:solid-server:default:StoreFactory" }, - "TemplatedPodGenerator:_variableHandler": { + "variableHandler": { "@type": "ParallelHandler", - "ParallelHandler:_handlers": [ + "handlers": [ { "@type": "BaseUrlHandler" }, { "@type": "RootFilePathHandler", - "RootFilePathHandler:_fileMapper": { + "fileMapper": { "@type": "ExtensionBasedMapper", - "ExtensionBasedMapper:_base": { + "base": { "@id": "urn:solid-server:default:variable:baseUrl" }, - "ExtensionBasedMapper:_rootFilepath": { + "rootFilepath": { "@id": "urn:solid-server:default:variable:rootFilePath" }, - "ExtensionBasedMapper:_overrideTypes_acl": "text/turtle", - "ExtensionBasedMapper:_overrideTypes_meta": "text/turtle" + "overrideTypes_acl": "text/turtle", + "overrideTypes_meta": "text/turtle" } } ] }, - "TemplatedPodGenerator:_configStorage": { + "configStorage": { "@id": "urn:solid-server:default:PodConfigurationStorage" } }, @@ -64,26 +64,26 @@ { "@id": "urn:solid-server:default:PodManager", "@type": "ConfigPodManager", - "ConfigPodManager:_idGenerator": { + "idGenerator": { "@type": "SuffixIdentifierGenerator", - "SuffixIdentifierGenerator:_base": { + "base": { "@id": "urn:solid-server:default:variable:baseUrl" } }, - "ConfigPodManager:_podGenerator": { + "podGenerator": { "@id": "urn:solid-server:default:PodGenerator" }, - "ConfigPodManager:_routingStorage": { + "routingStorage": { "@id": "urn:solid-server:default:PodRoutingStorage" }, - "ConfigPodManager:_resourcesGenerator": { + "resourcesGenerator": { "@id": "urn:solid-server:default:ResourcesGenerator", "@type": "TemplatedResourcesGenerator", - "TemplatedResourcesGenerator:_templateFolder": "$PACKAGE_ROOT/templates/pod", - "TemplatedResourcesGenerator:_factory": { + "templateFolder": "$PACKAGE_ROOT/templates/pod", + "factory": { "@type": "ExtensionBasedMapperFactory" }, - "TemplatedResourcesGenerator:_engine": { + "engine": { "@type": "HandlebarsTemplateEngine" } } @@ -92,17 +92,17 @@ { "@id": "urn:solid-server:default:PodManagerHandler", "@type": "PodManagerHttpHandler", - "PodManagerHttpHandler:_args_requestPath": "/pods", - "PodManagerHttpHandler:_args_requestParser": { + "args_requestPath": "/pods", + "args_requestParser": { "@id": "urn:solid-server:default:RequestParser" }, - "PodManagerHttpHandler:_args_podSettingsParser": { + "args_podSettingsParser": { "@type": "PodSettingsJsonParser" }, - "PodManagerHttpHandler:_args_manager": { + "args_manager": { "@id": "urn:solid-server:default:PodManager" }, - "PodManagerHttpHandler:_args_responseWriter": { + "args_responseWriter": { "@id": "urn:solid-server:default:ResponseWriter" } }, @@ -112,13 +112,13 @@ "comment": "Add entry to initializer list", "SequenceHandler:_handlers": { "@type": "ConfigPodInitializer", - "ConfigPodInitializer:_storeFactory": { + "storeFactory": { "@id": "urn:solid-server:default:StoreFactory" }, - "ConfigPodInitializer:_configStorage": { + "configStorage": { "@id": "urn:solid-server:default:PodConfigurationStorage" }, - "ConfigPodInitializer:_routingStorage": { + "routingStorage": { "@id": "urn:solid-server:default:PodRoutingStorage" } } @@ -127,7 +127,7 @@ { "@id": "urn:solid-server:default:BaseUrlRouterRule", "@type": "BaseUrlRouterRule", - "BaseUrlRouterRule:_stores": { + "stores": { "@id": "urn:solid-server:default:PodRoutingStorage" } }, @@ -135,7 +135,7 @@ { "@id": "urn:solid-server:default:RoutingResourceStore", "@type": "RoutingResourceStore", - "RoutingResourceStore:_rule": { + "rule": { "@id": "urn:solid-server:default:BaseUrlRouterRule" } } diff --git a/config/presets/pod-management.json b/config/presets/pod-management.json index 769c90966..e699fb5f5 100644 --- a/config/presets/pod-management.json +++ b/config/presets/pod-management.json @@ -4,41 +4,41 @@ { "@id": "urn:solid-server:default:ResourcesGenerator", "@type": "TemplatedResourcesGenerator", - "TemplatedResourcesGenerator:_templateFolder": "$PACKAGE_ROOT/templates/pod", - "TemplatedResourcesGenerator:_factory": { + "templateFolder": "$PACKAGE_ROOT/templates/pod", + "factory": { "@type": "ExtensionBasedMapperFactory" }, - "TemplatedResourcesGenerator:_engine": { + "engine": { "@type": "HandlebarsTemplateEngine" } }, { "@id": "urn:solid-server:default:PodManager", "@type": "GeneratedPodManager", - "GeneratedPodManager:_store": { + "store": { "@id": "urn:solid-server:default:ResourceStore" }, - "GeneratedPodManager:_idGenerator": { + "idGenerator": { "@id": "urn:solid-server:default:IdentifierGenerator" }, - "GeneratedPodManager:_resourcesGenerator": { + "resourcesGenerator": { "@id": "urn:solid-server:default:ResourcesGenerator" } }, { "@id": "urn:solid-server:default:PodManagerHandler", "@type": "PodManagerHttpHandler", - "PodManagerHttpHandler:_args_requestPath": "/pods", - "PodManagerHttpHandler:_args_requestParser": { + "args_requestPath": "/pods", + "args_requestParser": { "@id": "urn:solid-server:default:RequestParser" }, - "PodManagerHttpHandler:_args_podSettingsParser": { + "args_podSettingsParser": { "@type": "PodSettingsJsonParser" }, - "PodManagerHttpHandler:_args_manager": { + "args_manager": { "@id": "urn:solid-server:default:PodManager" }, - "PodManagerHttpHandler:_args_responseWriter": { + "args_responseWriter": { "@id": "urn:solid-server:default:ResponseWriter" } } diff --git a/config/presets/representation-conversion.json b/config/presets/representation-conversion.json index 5c7d97677..475985938 100644 --- a/config/presets/representation-conversion.json +++ b/config/presets/representation-conversion.json @@ -9,7 +9,7 @@ { "@id": "urn:solid-server:default:QuadToRdfConverter", "@type": "QuadToRdfConverter", - "QuadToRdfConverter:_options_outputPreferences": [ + "options_outputPreferences": [ { "QuadToRdfConverter:_options_outputPreferences_key": "text/turtle", "QuadToRdfConverter:_options_outputPreferences_value": 1 @@ -40,7 +40,7 @@ { "@id": "urn:solid-server:default:ContentTypeReplacer", "@type": "ContentTypeReplacer", - "ContentTypeReplacer:_replacements": [ + "replacements": [ { "ContentTypeReplacer:_replacements_key": "application/n-triples", "ContentTypeReplacer:_replacements_value": "text/turtle" @@ -67,7 +67,7 @@ { "@id": "urn:solid-server:default:RdfRepresentationConverter", "@type": "ChainedConverter", - "ChainedConverter:_converters": [ + "converters": [ { "@id": "urn:solid-server:default:RdfToQuadConverter" }, @@ -80,7 +80,7 @@ { "@id": "urn:solid-server:default:RepresentationConverter", "@type": "WaterfallHandler", - "WaterfallHandler:_handlers": [ + "handlers": [ { "@id": "urn:solid-server:default:IndexConverter" }, @@ -106,7 +106,7 @@ { "@id": "urn:solid-server:default:RdfValidator", "@type": "RdfValidator", - "RdfValidator:_converter": { + "converter": { "@id": "urn:solid-server:default:RepresentationConverter" } } diff --git a/config/presets/storage-wrapper.json b/config/presets/storage-wrapper.json index 95fd8ce45..496d398c2 100644 --- a/config/presets/storage-wrapper.json +++ b/config/presets/storage-wrapper.json @@ -4,7 +4,7 @@ { "@id": "urn:solid-server:default:ResourceStore", "@type": "MonitoringStore", - "MonitoringStore:_source": { + "source": { "@id": "urn:solid-server:default:ResourceStore_Locking" } }, @@ -12,7 +12,7 @@ { "@id": "urn:solid-server:default:AuxiliaryStrategy", "@type": "RoutingAuxiliaryStrategy", - "RoutingAuxiliaryStrategy:_sources": [ + "sources": [ { "@id": "urn:solid-server:default:AclStrategy" } @@ -22,13 +22,13 @@ { "@id": "urn:solid-server:default:ResourceStore_Locking", "@type": "LockingResourceStore", - "LockingResourceStore:_source": { + "source": { "@id": "urn:solid-server:default:ResourceStore_Patching" }, - "LockingResourceStore:_locks": { + "locks": { "@id": "urn:solid-server:default:ResourceLocker" }, - "LockingResourceStore:_strategy": { + "strategy": { "@id": "urn:solid-server:default:AuxiliaryStrategy" } }, @@ -36,13 +36,13 @@ { "@id": "urn:solid-server:default:ResourceStore_Patching", "@type": "PatchingStore", - "PatchingStore:_source": { + "source": { "@id": "urn:solid-server:default:ResourceStore_Converting" }, - "PatchingStore:_patcher": { + "patcher": { "@id": "urn:solid-server:default:PatchHandler", "@type": "SparqlUpdatePatchHandler", - "SparqlUpdatePatchHandler:_source": { + "source": { "@id": "urn:solid-server:default:ResourceStore_ToTurtle" } } @@ -51,47 +51,47 @@ { "@id": "urn:solid-server:default:ResourceLocker", "@type": "WrappedExpiringReadWriteLocker", - "WrappedExpiringReadWriteLocker:_locker": { + "locker": { "@type": "GreedyReadWriteLocker", - "GreedyReadWriteLocker:_locker": { + "locker": { "@type": "SingleThreadedResourceLocker" }, - "GreedyReadWriteLocker:_storage": { + "storage": { "@type": "ResourceIdentifierStorage", - "ResourceIdentifierStorage:_source": { + "source": { "@type": "MemoryMapStorage" } }, - "GreedyReadWriteLocker:_suffixes_count": "count", - "GreedyReadWriteLocker:_suffixes_read": "read", - "GreedyReadWriteLocker:_suffixes_write": "write" + "suffixes_count": "count", + "suffixes_read": "read", + "suffixes_write": "write" }, - "WrappedExpiringReadWriteLocker:_expiration": 3000 + "expiration": 3000 }, { "@id": "urn:solid-server:default:ResourceStore_ToTurtle", "@type": "RepresentationConvertingStore", - "RepresentationConvertingStore:_source": { + "source": { "@id": "urn:solid-server:default:RoutingResourceStore" }, - "RepresentationConvertingStore:_options_outConverter": { + "options_outConverter": { "@id": "urn:solid-server:default:RepresentationConverter" }, - "RepresentationConvertingStore:_options_inConverter": { + "options_inConverter": { "@id": "urn:solid-server:default:RepresentationConverter" }, - "RepresentationConvertingStore:_options_inType": "text/turtle" + "options_inType": "text/turtle" }, { "@id": "urn:solid-server:default:ResourceStore_Converting", "@type": "RepresentationConvertingStore", - "RepresentationConvertingStore:_source": { + "source": { "@id": "urn:solid-server:default:RoutingResourceStore" }, - "RepresentationConvertingStore:_options_outConverter": { + "options_outConverter": { "@id": "urn:solid-server:default:RepresentationConverter" } } diff --git a/config/presets/storage/backend/storage-filesystem-subdomains.json b/config/presets/storage/backend/storage-filesystem-subdomains.json index b52bd837c..b298d55de 100644 --- a/config/presets/storage/backend/storage-filesystem-subdomains.json +++ b/config/presets/storage/backend/storage-filesystem-subdomains.json @@ -4,33 +4,33 @@ { "@id": "urn:solid-server:default:FileIdentifierMapper", "@type": "SubdomainExtensionBasedMapper", - "SubdomainExtensionBasedMapper:_base": { + "base": { "@id": "urn:solid-server:default:variable:baseUrl" }, - "SubdomainExtensionBasedMapper:_rootFilepath": { + "rootFilepath": { "@id": "urn:solid-server:default:variable:rootFilePath" }, - "SubdomainExtensionBasedMapper:_baseSubdomain": "www", - "SubdomainExtensionBasedMapper:_overrideTypes_acl": "text/turtle", - "SubdomainExtensionBasedMapper:_overrideTypes_meta": "text/turtle" + "baseSubdomain": "www", + "overrideTypes_acl": "text/turtle", + "overrideTypes_meta": "text/turtle" }, { "@id": "urn:solid-server:default:FileDataAccessor", "@type": "FileDataAccessor", - "FileDataAccessor:_resourceMapper": { + "resourceMapper": { "@id": "urn:solid-server:default:FileIdentifierMapper" } }, { "@id": "urn:solid-server:default:FileResourceStore", "@type": "DataAccessorBasedStore", - "DataAccessorBasedStore:_accessor": { + "accessor": { "@id": "urn:solid-server:default:FileDataAccessor" }, - "DataAccessorBasedStore:_identifierStrategy": { + "identifierStrategy": { "@id": "urn:solid-server:default:IdentifierStrategy" }, - "DataAccessorBasedStore:_auxiliaryStrategy": { + "auxiliaryStrategy": { "@id": "urn:solid-server:default:AuxiliaryStrategy" } } diff --git a/config/presets/storage/backend/storage-filesystem.json b/config/presets/storage/backend/storage-filesystem.json index 38bb8328f..042c980a0 100644 --- a/config/presets/storage/backend/storage-filesystem.json +++ b/config/presets/storage/backend/storage-filesystem.json @@ -4,32 +4,32 @@ { "@id": "urn:solid-server:default:FileIdentifierMapper", "@type": "ExtensionBasedMapper", - "ExtensionBasedMapper:_base": { + "base": { "@id": "urn:solid-server:default:variable:baseUrl" }, - "ExtensionBasedMapper:_rootFilepath": { + "rootFilepath": { "@id": "urn:solid-server:default:variable:rootFilePath" }, - "ExtensionBasedMapper:_overrideTypes_acl": "text/turtle", - "ExtensionBasedMapper:_overrideTypes_meta": "text/turtle" + "overrideTypes_acl": "text/turtle", + "overrideTypes_meta": "text/turtle" }, { "@id": "urn:solid-server:default:FileDataAccessor", "@type": "FileDataAccessor", - "FileDataAccessor:_resourceMapper": { + "resourceMapper": { "@id": "urn:solid-server:default:FileIdentifierMapper" } }, { "@id": "urn:solid-server:default:FileResourceStore", "@type": "DataAccessorBasedStore", - "DataAccessorBasedStore:_accessor": { + "accessor": { "@id": "urn:solid-server:default:FileDataAccessor" }, - "DataAccessorBasedStore:_identifierStrategy": { + "identifierStrategy": { "@id": "urn:solid-server:default:IdentifierStrategy" }, - "DataAccessorBasedStore:_auxiliaryStrategy": { + "auxiliaryStrategy": { "@id": "urn:solid-server:default:AuxiliaryStrategy" } } diff --git a/config/presets/storage/backend/storage-memory.json b/config/presets/storage/backend/storage-memory.json index 027566b31..88fcf6048 100644 --- a/config/presets/storage/backend/storage-memory.json +++ b/config/presets/storage/backend/storage-memory.json @@ -4,20 +4,20 @@ { "@id": "urn:solid-server:default:MemoryDataAccessor", "@type": "InMemoryDataAccessor", - "InMemoryDataAccessor:_strategy": { + "strategy": { "@id": "urn:solid-server:default:IdentifierStrategy" } }, { "@id": "urn:solid-server:default:MemoryResourceStore", "@type": "DataAccessorBasedStore", - "DataAccessorBasedStore:_accessor": { + "accessor": { "@id": "urn:solid-server:default:MemoryDataAccessor" }, - "DataAccessorBasedStore:_identifierStrategy": { + "identifierStrategy": { "@id": "urn:solid-server:default:IdentifierStrategy" }, - "DataAccessorBasedStore:_auxiliaryStrategy": { + "auxiliaryStrategy": { "@id": "urn:solid-server:default:AuxiliaryStrategy" } } diff --git a/config/presets/storage/backend/storage-sparql-endpoint.json b/config/presets/storage/backend/storage-sparql-endpoint.json index 3ed999079..da9aa1d94 100644 --- a/config/presets/storage/backend/storage-sparql-endpoint.json +++ b/config/presets/storage/backend/storage-sparql-endpoint.json @@ -4,10 +4,10 @@ { "@id": "urn:solid-server:default:SparqlDataAccessor", "@type": "SparqlDataAccessor", - "SparqlDataAccessor:_endpoint": { + "endpoint": { "@id": "urn:solid-server:default:variable:sparqlEndpoint" }, - "SparqlDataAccessor:_identifierStrategy": { + "identifierStrategy": { "@id": "urn:solid-server:default:IdentifierStrategy" } }, @@ -15,13 +15,13 @@ { "@id": "urn:solid-server:default:DataAccessorBasedStore", "@type": "DataAccessorBasedStore", - "DataAccessorBasedStore:_accessor": { + "accessor": { "@id": "urn:solid-server:default:SparqlDataAccessor" }, - "DataAccessorBasedStore:_identifierStrategy": { + "identifierStrategy": { "@id": "urn:solid-server:default:IdentifierStrategy" }, - "DataAccessorBasedStore:_auxiliaryStrategy": { + "auxiliaryStrategy": { "@id": "urn:solid-server:default:AuxiliaryStrategy" } }, @@ -29,13 +29,13 @@ { "@id": "urn:solid-server:default:SparqlResourceStore", "@type": "RepresentationConvertingStore", - "RepresentationConvertingStore:_source": { + "source": { "@id": "urn:solid-server:default:DataAccessorBasedStore" }, - "RepresentationConvertingStore:_options_inConverter": { + "options_inConverter": { "@id": "urn:solid-server:default:RepresentationConverter" }, - "RepresentationConvertingStore:_options_inType": "internal/quads" + "options_inType": "internal/quads" } ] } diff --git a/config/presets/storage/routing/quad-type-routing.json b/config/presets/storage/routing/quad-type-routing.json index 74376da0d..3ed2ce185 100644 --- a/config/presets/storage/routing/quad-type-routing.json +++ b/config/presets/storage/routing/quad-type-routing.json @@ -4,25 +4,25 @@ { "@id": "urn:solid-server:default:PreferenceSupport", "@type": "PreferenceSupport", - "PreferenceSupport:_type": "internal/quads", - "PreferenceSupport:_converter": { + "type": "internal/quads", + "converter": { "@id": "urn:solid-server:default:RepresentationConverter" } }, { "@id": "urn:solid-server:default:ConvertingRouterRule", "@type": "ConvertingRouterRule", - "ConvertingRouterRule:_store": { + "store": { "@id": "urn:solid-server:default:SparqlResourceStore" }, - "ConvertingRouterRule:_supportChecker": { + "supportChecker": { "@id": "urn:solid-server:default:PreferenceSupport" } }, { "@id": "urn:solid-server:default:RoutingResourceStore", "@type": "RoutingResourceStore", - "RoutingResourceStore:_rule": { + "rule": { "@id": "urn:solid-server:default:ConvertingRouterRule" } } diff --git a/config/presets/storage/routing/regex-routing.json b/config/presets/storage/routing/regex-routing.json index 308335938..d8d722105 100644 --- a/config/presets/storage/routing/regex-routing.json +++ b/config/presets/storage/routing/regex-routing.json @@ -4,14 +4,14 @@ { "@id": "urn:solid-server:default:RegexRouterRule", "@type": "RegexRouterRule", - "RegexRouterRule:_base": { + "base": { "@id": "urn:solid-server:default:variable:baseUrl" } }, { "@id": "urn:solid-server:default:RoutingResourceStore", "@type": "RoutingResourceStore", - "RoutingResourceStore:_rule": { + "rule": { "@id": "urn:solid-server:default:RegexRouterRule" } } diff --git a/config/templates/storage-defaults.json b/config/templates/storage-defaults.json index 6694ecccd..d0fb2f918 100644 --- a/config/templates/storage-defaults.json +++ b/config/templates/storage-defaults.json @@ -14,7 +14,7 @@ "@id": "urn:solid-server:default:AuxiliaryStrategy", "comment": "Copied from storage-wrapper.json since a variable is required in there", "@type": "RoutingAuxiliaryStrategy", - "RoutingAuxiliaryStrategy:_sources": [ + "sources": [ { "@id": "urn:solid-server:default:AclStrategy" } @@ -24,7 +24,7 @@ { "@id": "urn:solid-server:template:IdentifierStrategy", "@type": "SingleRootIdentifierStrategy", - "SingleRootIdentifierStrategy:_baseUrl": { + "baseUrl": { "@id": "urn:solid-server:template:variable:baseUrl" } }, @@ -32,13 +32,13 @@ { "@id": "urn:solid-server:template:ResourceStore", "@type": "DataAccessorBasedStore", - "DataAccessorBasedStore:_accessor": { + "accessor": { "@id": "urn:solid-server:template:DataAccessor" }, - "DataAccessorBasedStore:_identifierStrategy": { + "identifierStrategy": { "@id": "urn:solid-server:template:IdentifierStrategy" }, - "DataAccessorBasedStore:_auxiliaryStrategy": { + "auxiliaryStrategy": { "@id": "urn:solid-server:default:AuxiliaryStrategy" } }, diff --git a/config/templates/storage-filesystem.json b/config/templates/storage-filesystem.json index 1c6c6439f..35dcc62c1 100644 --- a/config/templates/storage-filesystem.json +++ b/config/templates/storage-filesystem.json @@ -11,20 +11,20 @@ { "@id": "urn:solid-server:template:FileIdentifierMapper", "@type": "ExtensionBasedMapper", - "ExtensionBasedMapper:_base": { + "base": { "@id": "urn:solid-server:template:variable:baseUrl" }, - "ExtensionBasedMapper:_rootFilepath": { + "rootFilepath": { "@id": "urn:solid-server:template:variable:rootFilePath" }, - "ExtensionBasedMapper:_overrideTypes_acl": "text/turtle", - "ExtensionBasedMapper:_overrideTypes_meta": "text/turtle" + "overrideTypes_acl": "text/turtle", + "overrideTypes_meta": "text/turtle" }, { "@id": "urn:solid-server:template:DataAccessor", "@type": "FileDataAccessor", - "FileDataAccessor:_resourceMapper": { + "resourceMapper": { "@id": "urn:solid-server:template:FileIdentifierMapper" } }, diff --git a/config/templates/storage-memory.json b/config/templates/storage-memory.json index bc44163ea..d021ff994 100644 --- a/config/templates/storage-memory.json +++ b/config/templates/storage-memory.json @@ -11,7 +11,7 @@ { "@id": "urn:solid-server:template:DataAccessor", "@type": "InMemoryDataAccessor", - "InMemoryDataAccessor:_strategy": { + "strategy": { "@id": "urn:solid-server:template:IdentifierStrategy" } }