feat: shorten properties in configs

CommunitySolidServer · Apr 27, 2021 · 420e497 · 420e497
1 parent 2861b90
commit 420e497
Show file tree

Hide file tree

Showing 33 changed files with 190 additions and 190 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
     }
   ]
 }