From 2c46d70780d1af4736156f2b480e8208d2c1b3f4 Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Wed, 18 Nov 2020 15:48:49 +0100 Subject: [PATCH] refactor: move ExtensionBasedMapper into mapping directory --- index.ts | 4 +++- src/storage/{ => mapping}/ExtensionBasedMapper.ts | 14 +++++++------- test/integration/FullConfig.acl.test.ts | 2 +- test/integration/FullConfig.noAuth.test.ts | 2 +- .../storage/accessors/FileDataAccessor.test.ts | 2 +- .../{ => mapping}/ExtensionBasedMapper.test.ts | 8 ++++---- 6 files changed, 17 insertions(+), 15 deletions(-) rename src/storage/{ => mapping}/ExtensionBasedMapper.ts (94%) rename test/unit/storage/{ => mapping}/ExtensionBasedMapper.test.ts (94%) diff --git a/index.ts b/index.ts index dbdb5acb3..6890e70b8 100644 --- a/index.ts +++ b/index.ts @@ -102,6 +102,9 @@ export * from './src/storage/conversion/RdfToQuadConverter'; export * from './src/storage/conversion/RepresentationConverter'; export * from './src/storage/conversion/TypedRepresentationConverter'; +// Storage/Mapping +export * from './src/storage/mapping/ExtensionBasedMapper'; + // Storage/Patch export * from './src/storage/patch/PatchHandler'; export * from './src/storage/patch/SparqlUpdatePatchHandler'; @@ -116,7 +119,6 @@ export * from './src/storage/routing/RouterRule'; export * from './src/storage/AtomicResourceStore'; export * from './src/storage/Conditions'; export * from './src/storage/DataAccessorBasedStore'; -export * from './src/storage/ExtensionBasedMapper'; export * from './src/storage/FileIdentifierMapper'; export * from './src/storage/Lock'; export * from './src/storage/LockingResourceStore'; diff --git a/src/storage/ExtensionBasedMapper.ts b/src/storage/mapping/ExtensionBasedMapper.ts similarity index 94% rename from src/storage/ExtensionBasedMapper.ts rename to src/storage/mapping/ExtensionBasedMapper.ts index 0ab52786f..7127fa2b5 100644 --- a/src/storage/ExtensionBasedMapper.ts +++ b/src/storage/mapping/ExtensionBasedMapper.ts @@ -1,19 +1,19 @@ import { promises as fsPromises } from 'fs'; import { posix } from 'path'; import * as mime from 'mime-types'; -import type { ResourceIdentifier } from '../ldp/representation/ResourceIdentifier'; -import { getLoggerFor } from '../logging/LogUtil'; -import { APPLICATION_OCTET_STREAM, TEXT_TURTLE } from '../util/ContentTypes'; -import { NotFoundHttpError } from '../util/errors/NotFoundHttpError'; -import { UnsupportedHttpError } from '../util/errors/UnsupportedHttpError'; +import type { ResourceIdentifier } from '../../ldp/representation/ResourceIdentifier'; +import { getLoggerFor } from '../../logging/LogUtil'; +import { APPLICATION_OCTET_STREAM, TEXT_TURTLE } from '../../util/ContentTypes'; +import { NotFoundHttpError } from '../../util/errors/NotFoundHttpError'; +import { UnsupportedHttpError } from '../../util/errors/UnsupportedHttpError'; import { decodeUriPathComponents, encodeUriPathComponents, ensureTrailingSlash, isContainerIdentifier, trimTrailingSlashes, -} from '../util/PathUtil'; -import type { FileIdentifierMapper, ResourceLink } from './FileIdentifierMapper'; +} from '../../util/PathUtil'; +import type { FileIdentifierMapper, ResourceLink } from '../FileIdentifierMapper'; const { join: joinPath, normalize: normalizePath } = posix; diff --git a/test/integration/FullConfig.acl.test.ts b/test/integration/FullConfig.acl.test.ts index 72f355589..63252fcdf 100644 --- a/test/integration/FullConfig.acl.test.ts +++ b/test/integration/FullConfig.acl.test.ts @@ -4,7 +4,7 @@ import * as rimraf from 'rimraf'; import { RepresentationMetadata } from '../../src/ldp/representation/RepresentationMetadata'; import { FileDataAccessor } from '../../src/storage/accessors/FileDataAccessor'; import { InMemoryDataAccessor } from '../../src/storage/accessors/InMemoryDataAccessor'; -import { ExtensionBasedMapper } from '../../src/storage/ExtensionBasedMapper'; +import { ExtensionBasedMapper } from '../../src/storage/mapping/ExtensionBasedMapper'; import { ensureTrailingSlash } from '../../src/util/PathUtil'; import { CONTENT_TYPE, LDP } from '../../src/util/UriConstants'; import { AuthenticatedDataAccessorBasedConfig } from '../configs/AuthenticatedDataAccessorBasedConfig'; diff --git a/test/integration/FullConfig.noAuth.test.ts b/test/integration/FullConfig.noAuth.test.ts index 909eb6b88..e0a912368 100644 --- a/test/integration/FullConfig.noAuth.test.ts +++ b/test/integration/FullConfig.noAuth.test.ts @@ -3,7 +3,7 @@ import * as rimraf from 'rimraf'; import type { HttpHandler } from '../../src/server/HttpHandler'; import { FileDataAccessor } from '../../src/storage/accessors/FileDataAccessor'; import { InMemoryDataAccessor } from '../../src/storage/accessors/InMemoryDataAccessor'; -import { ExtensionBasedMapper } from '../../src/storage/ExtensionBasedMapper'; +import { ExtensionBasedMapper } from '../../src/storage/mapping/ExtensionBasedMapper'; import { LDP } from '../../src/util/UriConstants'; import { DataAccessorBasedConfig } from '../configs/DataAccessorBasedConfig'; import type { ServerConfig } from '../configs/ServerConfig'; diff --git a/test/unit/storage/accessors/FileDataAccessor.test.ts b/test/unit/storage/accessors/FileDataAccessor.test.ts index 23cfcb211..ec61e6087 100644 --- a/test/unit/storage/accessors/FileDataAccessor.test.ts +++ b/test/unit/storage/accessors/FileDataAccessor.test.ts @@ -3,7 +3,7 @@ import streamifyArray from 'streamify-array'; import type { Representation } from '../../../../src/ldp/representation/Representation'; import { RepresentationMetadata } from '../../../../src/ldp/representation/RepresentationMetadata'; import { FileDataAccessor } from '../../../../src/storage/accessors/FileDataAccessor'; -import { ExtensionBasedMapper } from '../../../../src/storage/ExtensionBasedMapper'; +import { ExtensionBasedMapper } from '../../../../src/storage/mapping/ExtensionBasedMapper'; import { APPLICATION_OCTET_STREAM } from '../../../../src/util/ContentTypes'; import { ConflictHttpError } from '../../../../src/util/errors/ConflictHttpError'; import { NotFoundHttpError } from '../../../../src/util/errors/NotFoundHttpError'; diff --git a/test/unit/storage/ExtensionBasedMapper.test.ts b/test/unit/storage/mapping/ExtensionBasedMapper.test.ts similarity index 94% rename from test/unit/storage/ExtensionBasedMapper.test.ts rename to test/unit/storage/mapping/ExtensionBasedMapper.test.ts index a9a2b92de..f356c4add 100644 --- a/test/unit/storage/ExtensionBasedMapper.test.ts +++ b/test/unit/storage/mapping/ExtensionBasedMapper.test.ts @@ -1,8 +1,8 @@ import fs from 'fs'; -import { ExtensionBasedMapper } from '../../../src/storage/ExtensionBasedMapper'; -import { NotFoundHttpError } from '../../../src/util/errors/NotFoundHttpError'; -import { UnsupportedHttpError } from '../../../src/util/errors/UnsupportedHttpError'; -import { trimTrailingSlashes } from '../../../src/util/PathUtil'; +import { ExtensionBasedMapper } from '../../../../src/storage/mapping/ExtensionBasedMapper'; +import { NotFoundHttpError } from '../../../../src/util/errors/NotFoundHttpError'; +import { UnsupportedHttpError } from '../../../../src/util/errors/UnsupportedHttpError'; +import { trimTrailingSlashes } from '../../../../src/util/PathUtil'; jest.mock('fs');