diff --git a/src/http/Operation.ts b/src/http/Operation.ts index 266145296..be607c797 100644 --- a/src/http/Operation.ts +++ b/src/http/Operation.ts @@ -1,4 +1,4 @@ -import type { Conditions } from '../storage/Conditions'; +import type { Conditions } from '../storage/conditions/Conditions'; import type { Representation } from './representation/Representation'; import type { RepresentationPreferences } from './representation/RepresentationPreferences'; import type { ResourceIdentifier } from './representation/ResourceIdentifier'; diff --git a/src/http/input/conditions/BasicConditionsParser.ts b/src/http/input/conditions/BasicConditionsParser.ts index 86af6bc0f..54fa8a4fc 100644 --- a/src/http/input/conditions/BasicConditionsParser.ts +++ b/src/http/input/conditions/BasicConditionsParser.ts @@ -1,8 +1,8 @@ import { getLoggerFor } from '../../../logging/LogUtil'; import type { HttpRequest } from '../../../server/HttpRequest'; -import type { BasicConditionsOptions } from '../../../storage/BasicConditions'; -import { BasicConditions } from '../../../storage/BasicConditions'; -import type { Conditions } from '../../../storage/Conditions'; +import type { BasicConditionsOptions } from '../../../storage/conditions/BasicConditions'; +import { BasicConditions } from '../../../storage/conditions/BasicConditions'; +import type { Conditions } from '../../../storage/conditions/Conditions'; import { splitCommaSeparated } from '../../../util/StringUtil'; import { ConditionsParser } from './ConditionsParser'; diff --git a/src/http/input/conditions/ConditionsParser.ts b/src/http/input/conditions/ConditionsParser.ts index 3970635bf..ae45f7f99 100644 --- a/src/http/input/conditions/ConditionsParser.ts +++ b/src/http/input/conditions/ConditionsParser.ts @@ -1,5 +1,5 @@ import type { HttpRequest } from '../../../server/HttpRequest'; -import type { Conditions } from '../../../storage/Conditions'; +import type { Conditions } from '../../../storage/conditions/Conditions'; import { AsyncHandler } from '../../../util/handlers/AsyncHandler'; /** diff --git a/src/http/ldp/GetOperationHandler.ts b/src/http/ldp/GetOperationHandler.ts index ded1fc3f5..8c1760d45 100644 --- a/src/http/ldp/GetOperationHandler.ts +++ b/src/http/ldp/GetOperationHandler.ts @@ -1,4 +1,4 @@ -import { getETag } from '../../storage/Conditions'; +import { getETag } from '../../storage/conditions/Conditions'; import type { ResourceStore } from '../../storage/ResourceStore'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; import { assertReadConditions } from '../../util/ResourceUtil'; diff --git a/src/http/ldp/HeadOperationHandler.ts b/src/http/ldp/HeadOperationHandler.ts index cac12f5a0..76ec1d746 100644 --- a/src/http/ldp/HeadOperationHandler.ts +++ b/src/http/ldp/HeadOperationHandler.ts @@ -1,4 +1,4 @@ -import { getETag } from '../../storage/Conditions'; +import { getETag } from '../../storage/conditions/Conditions'; import type { ResourceStore } from '../../storage/ResourceStore'; import { NotImplementedHttpError } from '../../util/errors/NotImplementedHttpError'; import { assertReadConditions } from '../../util/ResourceUtil'; diff --git a/src/index.ts b/src/index.ts index 217958b0e..02f241ecb 100644 --- a/src/index.ts +++ b/src/index.ts @@ -372,6 +372,10 @@ export * from './storage/accessors/PassthroughDataAccessor'; export * from './storage/accessors/SparqlDataAccessor'; export * from './storage/accessors/ValidatingDataAccessor'; +// Storage/Conditions +export * from './storage/conditions/BasicConditions'; +export * from './storage/conditions/Conditions'; + // Storage/Conversion export * from './storage/conversion/BaseTypedRepresentationConverter'; export * from './storage/conversion/ChainedConverter'; @@ -442,9 +446,7 @@ export * from './storage/validators/QuotaValidator'; // Storage export * from './storage/AtomicResourceStore'; export * from './storage/BaseResourceStore'; -export * from './storage/BasicConditions'; export * from './storage/CachedResourceSet'; -export * from './storage/Conditions'; export * from './storage/DataAccessorBasedStore'; export * from './storage/IndexRepresentationStore'; export * from './storage/LockingResourceStore'; diff --git a/src/server/notifications/ComposedNotificationHandler.ts b/src/server/notifications/ComposedNotificationHandler.ts index 048859d89..86ec3370f 100644 --- a/src/server/notifications/ComposedNotificationHandler.ts +++ b/src/server/notifications/ComposedNotificationHandler.ts @@ -1,4 +1,4 @@ -import { sameResourceState } from '../../storage/Conditions'; +import { sameResourceState } from '../../storage/conditions/Conditions'; import type { NotificationGenerator } from './generate/NotificationGenerator'; import type { NotificationEmitter } from './NotificationEmitter'; import type { NotificationHandlerInput } from './NotificationHandler'; diff --git a/src/server/notifications/generate/ActivityNotificationGenerator.ts b/src/server/notifications/generate/ActivityNotificationGenerator.ts index 2583e5344..f0cb65880 100644 --- a/src/server/notifications/generate/ActivityNotificationGenerator.ts +++ b/src/server/notifications/generate/ActivityNotificationGenerator.ts @@ -1,4 +1,4 @@ -import { getETag } from '../../../storage/Conditions'; +import { getETag } from '../../../storage/conditions/Conditions'; import type { ResourceStore } from '../../../storage/ResourceStore'; import { NotImplementedHttpError } from '../../../util/errors/NotImplementedHttpError'; import { AS } from '../../../util/Vocabularies'; diff --git a/src/server/notifications/generate/AddRemoveNotificationGenerator.ts b/src/server/notifications/generate/AddRemoveNotificationGenerator.ts index 8f196c408..8db5c3f88 100644 --- a/src/server/notifications/generate/AddRemoveNotificationGenerator.ts +++ b/src/server/notifications/generate/AddRemoveNotificationGenerator.ts @@ -1,4 +1,4 @@ -import { getETag } from '../../../storage/Conditions'; +import { getETag } from '../../../storage/conditions/Conditions'; import type { ResourceStore } from '../../../storage/ResourceStore'; import { InternalServerError } from '../../../util/errors/InternalServerError'; import { NotImplementedHttpError } from '../../../util/errors/NotImplementedHttpError'; diff --git a/src/storage/BaseResourceStore.ts b/src/storage/BaseResourceStore.ts index c1df9be6e..533f99258 100644 --- a/src/storage/BaseResourceStore.ts +++ b/src/storage/BaseResourceStore.ts @@ -3,7 +3,7 @@ import type { Representation } from '../http/representation/Representation'; import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences'; import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError'; -import type { Conditions } from './Conditions'; +import type { Conditions } from './conditions/Conditions'; import type { ResourceStore, ChangeMap } from './ResourceStore'; /** diff --git a/src/storage/DataAccessorBasedStore.ts b/src/storage/DataAccessorBasedStore.ts index 2f055afb1..7aca94c13 100644 --- a/src/storage/DataAccessorBasedStore.ts +++ b/src/storage/DataAccessorBasedStore.ts @@ -44,7 +44,7 @@ import { AS, } from '../util/Vocabularies'; import type { DataAccessor } from './accessors/DataAccessor'; -import type { Conditions } from './Conditions'; +import type { Conditions } from './conditions/Conditions'; import type { ResourceStore, ChangeMap } from './ResourceStore'; import namedNode = DataFactory.namedNode; diff --git a/src/storage/IndexRepresentationStore.ts b/src/storage/IndexRepresentationStore.ts index 9860da81b..81986be0d 100644 --- a/src/storage/IndexRepresentationStore.ts +++ b/src/storage/IndexRepresentationStore.ts @@ -5,7 +5,7 @@ import type { ResourceIdentifier } from '../http/representation/ResourceIdentifi import { NotFoundHttpError } from '../util/errors/NotFoundHttpError'; import { isContainerIdentifier } from '../util/PathUtil'; import { isValidFileName } from '../util/StringUtil'; -import type { Conditions } from './Conditions'; +import type { Conditions } from './conditions/Conditions'; import { cleanPreferences, matchesMediaType } from './conversion/ConversionUtil'; import { PassthroughStore } from './PassthroughStore'; import type { ResourceStore } from './ResourceStore'; diff --git a/src/storage/LockingResourceStore.ts b/src/storage/LockingResourceStore.ts index 2107460b2..e7e3e4ebf 100644 --- a/src/storage/LockingResourceStore.ts +++ b/src/storage/LockingResourceStore.ts @@ -9,7 +9,7 @@ import { getLoggerFor } from '../logging/LogUtil'; import type { ExpiringReadWriteLocker } from '../util/locking/ExpiringReadWriteLocker'; import { endOfStream } from '../util/StreamUtil'; import type { AtomicResourceStore } from './AtomicResourceStore'; -import type { Conditions } from './Conditions'; +import type { Conditions } from './conditions/Conditions'; import type { ResourceStore, ChangeMap } from './ResourceStore'; /** diff --git a/src/storage/MonitoringStore.ts b/src/storage/MonitoringStore.ts index be84dbe0d..577003f1d 100644 --- a/src/storage/MonitoringStore.ts +++ b/src/storage/MonitoringStore.ts @@ -5,7 +5,7 @@ import type { RepresentationPreferences } from '../http/representation/Represent import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { BaseActivityEmitter } from '../server/notifications/ActivityEmitter'; import { AS, SOLID_AS } from '../util/Vocabularies'; -import type { Conditions } from './Conditions'; +import type { Conditions } from './conditions/Conditions'; import type { ResourceStore, ChangeMap } from './ResourceStore'; // The ActivityStream terms for which we emit an event diff --git a/src/storage/PassthroughStore.ts b/src/storage/PassthroughStore.ts index cf70c6a64..26f16fbdf 100644 --- a/src/storage/PassthroughStore.ts +++ b/src/storage/PassthroughStore.ts @@ -2,7 +2,7 @@ import type { Patch } from '../http/representation/Patch'; import type { Representation } from '../http/representation/Representation'; import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences'; import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; -import type { Conditions } from './Conditions'; +import type { Conditions } from './conditions/Conditions'; import type { ResourceStore, ChangeMap } from './ResourceStore'; /** diff --git a/src/storage/PatchingStore.ts b/src/storage/PatchingStore.ts index 495dc815f..692547810 100644 --- a/src/storage/PatchingStore.ts +++ b/src/storage/PatchingStore.ts @@ -1,7 +1,7 @@ import type { Patch } from '../http/representation/Patch'; import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError'; -import type { Conditions } from './Conditions'; +import type { Conditions } from './conditions/Conditions'; import { PassthroughStore } from './PassthroughStore'; import type { PatchHandler } from './patch/PatchHandler'; import type { ResourceStore, ChangeMap } from './ResourceStore'; diff --git a/src/storage/ReadOnlyStore.ts b/src/storage/ReadOnlyStore.ts index 1b2b50e27..5490dc31c 100644 --- a/src/storage/ReadOnlyStore.ts +++ b/src/storage/ReadOnlyStore.ts @@ -2,7 +2,7 @@ import type { Patch } from '../http/representation/Patch'; import type { Representation } from '../http/representation/Representation'; import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { ForbiddenHttpError } from '../util/errors/ForbiddenHttpError'; -import type { Conditions } from './Conditions'; +import type { Conditions } from './conditions/Conditions'; import { PassthroughStore } from './PassthroughStore'; import type { ResourceStore, ChangeMap } from './ResourceStore'; diff --git a/src/storage/RepresentationConvertingStore.ts b/src/storage/RepresentationConvertingStore.ts index 3f059b80f..3f7f1b13f 100644 --- a/src/storage/RepresentationConvertingStore.ts +++ b/src/storage/RepresentationConvertingStore.ts @@ -4,7 +4,7 @@ import type { RepresentationPreferences } from '../http/representation/Represent import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { getLoggerFor } from '../logging/LogUtil'; import { INTERNAL_QUADS } from '../util/ContentTypes'; -import type { Conditions } from './Conditions'; +import type { Conditions } from './conditions/Conditions'; import { PassthroughConverter } from './conversion/PassthroughConverter'; import type { RepresentationConverter } from './conversion/RepresentationConverter'; import { PassthroughStore } from './PassthroughStore'; diff --git a/src/storage/ResourceStore.ts b/src/storage/ResourceStore.ts index 8acda17a9..7f3d00e4d 100644 --- a/src/storage/ResourceStore.ts +++ b/src/storage/ResourceStore.ts @@ -4,7 +4,7 @@ import type { RepresentationMetadata } from '../http/representation/Representati import type { RepresentationPreferences } from '../http/representation/RepresentationPreferences'; import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import type { IdentifierMap } from '../util/map/IdentifierMap'; -import type { Conditions } from './Conditions'; +import type { Conditions } from './conditions/Conditions'; import type { ResourceSet } from './ResourceSet'; /** diff --git a/src/storage/RoutingResourceStore.ts b/src/storage/RoutingResourceStore.ts index 55d7c047e..a1dd73bdc 100644 --- a/src/storage/RoutingResourceStore.ts +++ b/src/storage/RoutingResourceStore.ts @@ -4,7 +4,7 @@ import type { RepresentationPreferences } from '../http/representation/Represent import type { ResourceIdentifier } from '../http/representation/ResourceIdentifier'; import { NotFoundHttpError } from '../util/errors/NotFoundHttpError'; import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError'; -import type { Conditions } from './Conditions'; +import type { Conditions } from './conditions/Conditions'; import type { ResourceStore, ChangeMap } from './ResourceStore'; import type { RouterRule } from './routing/RouterRule'; diff --git a/src/storage/BasicConditions.ts b/src/storage/conditions/BasicConditions.ts similarity index 94% rename from src/storage/BasicConditions.ts rename to src/storage/conditions/BasicConditions.ts index 25ad3c770..aa45a4268 100644 --- a/src/storage/BasicConditions.ts +++ b/src/storage/conditions/BasicConditions.ts @@ -1,5 +1,5 @@ -import type { RepresentationMetadata } from '../http/representation/RepresentationMetadata'; -import { DC } from '../util/Vocabularies'; +import type { RepresentationMetadata } from '../../http/representation/RepresentationMetadata'; +import { DC } from '../../util/Vocabularies'; import { getETag, sameResourceState } from './Conditions'; import type { Conditions } from './Conditions'; diff --git a/src/storage/Conditions.ts b/src/storage/conditions/Conditions.ts similarity index 93% rename from src/storage/Conditions.ts rename to src/storage/conditions/Conditions.ts index baeb5a8fd..5178262ea 100644 --- a/src/storage/Conditions.ts +++ b/src/storage/conditions/Conditions.ts @@ -1,5 +1,5 @@ -import type { RepresentationMetadata } from '../http/representation/RepresentationMetadata'; -import { DC } from '../util/Vocabularies'; +import type { RepresentationMetadata } from '../../http/representation/RepresentationMetadata'; +import { DC } from '../../util/Vocabularies'; /** * The conditions of an HTTP conditional request. diff --git a/src/util/ResourceUtil.ts b/src/util/ResourceUtil.ts index 43de0b121..090b77b97 100644 --- a/src/util/ResourceUtil.ts +++ b/src/util/ResourceUtil.ts @@ -3,7 +3,7 @@ import { DataFactory } from 'n3'; import { BasicRepresentation } from '../http/representation/BasicRepresentation'; import type { Representation } from '../http/representation/Representation'; import { RepresentationMetadata } from '../http/representation/RepresentationMetadata'; -import type { Conditions } from '../storage/Conditions'; +import type { Conditions } from '../storage/conditions/Conditions'; import { NotModifiedHttpError } from './errors/NotModifiedHttpError'; import { guardedStreamFrom } from './StreamUtil'; import { toLiteral } from './TermUtil'; diff --git a/test/integration/RequestParser.test.ts b/test/integration/RequestParser.test.ts index 00efe2592..1c862806e 100644 --- a/test/integration/RequestParser.test.ts +++ b/test/integration/RequestParser.test.ts @@ -9,7 +9,7 @@ import { ContentTypeParser } from '../../src/http/input/metadata/ContentTypePars import { AcceptPreferenceParser } from '../../src/http/input/preferences/AcceptPreferenceParser'; import { RepresentationMetadata } from '../../src/http/representation/RepresentationMetadata'; import type { HttpRequest } from '../../src/server/HttpRequest'; -import { BasicConditions } from '../../src/storage/BasicConditions'; +import { BasicConditions } from '../../src/storage/conditions/BasicConditions'; import { guardedStreamFrom } from '../../src/util/StreamUtil'; describe('A BasicRequestParser with simple input parsers', (): void => { diff --git a/test/unit/http/ldp/DeleteOperationHandler.test.ts b/test/unit/http/ldp/DeleteOperationHandler.test.ts index e16d25590..7ef83b474 100644 --- a/test/unit/http/ldp/DeleteOperationHandler.test.ts +++ b/test/unit/http/ldp/DeleteOperationHandler.test.ts @@ -1,7 +1,7 @@ import { DeleteOperationHandler } from '../../../../src/http/ldp/DeleteOperationHandler'; import type { Operation } from '../../../../src/http/Operation'; import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; -import { BasicConditions } from '../../../../src/storage/BasicConditions'; +import { BasicConditions } from '../../../../src/storage/conditions/BasicConditions'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; diff --git a/test/unit/http/ldp/GetOperationHandler.test.ts b/test/unit/http/ldp/GetOperationHandler.test.ts index 976c9a465..6764fa366 100644 --- a/test/unit/http/ldp/GetOperationHandler.test.ts +++ b/test/unit/http/ldp/GetOperationHandler.test.ts @@ -4,8 +4,8 @@ import type { Operation } from '../../../../src/http/Operation'; import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; import type { Representation } from '../../../../src/http/representation/Representation'; import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; -import { BasicConditions } from '../../../../src/storage/BasicConditions'; -import { getETag } from '../../../../src/storage/Conditions'; +import { BasicConditions } from '../../../../src/storage/conditions/BasicConditions'; +import { getETag } from '../../../../src/storage/conditions/Conditions'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; import { NotModifiedHttpError } from '../../../../src/util/errors/NotModifiedHttpError'; diff --git a/test/unit/http/ldp/HeadOperationHandler.test.ts b/test/unit/http/ldp/HeadOperationHandler.test.ts index 39094ba90..e7250f4fc 100644 --- a/test/unit/http/ldp/HeadOperationHandler.test.ts +++ b/test/unit/http/ldp/HeadOperationHandler.test.ts @@ -4,8 +4,8 @@ import type { Operation } from '../../../../src/http/Operation'; import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; import type { Representation } from '../../../../src/http/representation/Representation'; import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; -import { BasicConditions } from '../../../../src/storage/BasicConditions'; -import { getETag } from '../../../../src/storage/Conditions'; +import { BasicConditions } from '../../../../src/storage/conditions/BasicConditions'; +import { getETag } from '../../../../src/storage/conditions/Conditions'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; import { NotModifiedHttpError } from '../../../../src/util/errors/NotModifiedHttpError'; diff --git a/test/unit/http/ldp/PatchOperationHandler.test.ts b/test/unit/http/ldp/PatchOperationHandler.test.ts index 185beadd8..6723b28ae 100644 --- a/test/unit/http/ldp/PatchOperationHandler.test.ts +++ b/test/unit/http/ldp/PatchOperationHandler.test.ts @@ -2,7 +2,7 @@ import { PatchOperationHandler } from '../../../../src/http/ldp/PatchOperationHa import type { Operation } from '../../../../src/http/Operation'; import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; import type { Representation } from '../../../../src/http/representation/Representation'; -import { BasicConditions } from '../../../../src/storage/BasicConditions'; +import { BasicConditions } from '../../../../src/storage/conditions/BasicConditions'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError'; import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError'; diff --git a/test/unit/http/ldp/PostOperationHandler.test.ts b/test/unit/http/ldp/PostOperationHandler.test.ts index e7472218d..29a938894 100644 --- a/test/unit/http/ldp/PostOperationHandler.test.ts +++ b/test/unit/http/ldp/PostOperationHandler.test.ts @@ -3,7 +3,7 @@ import type { Operation } from '../../../../src/http/Operation'; import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; import type { Representation } from '../../../../src/http/representation/Representation'; import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; -import { BasicConditions } from '../../../../src/storage/BasicConditions'; +import { BasicConditions } from '../../../../src/storage/conditions/BasicConditions'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError'; import { InternalServerError } from '../../../../src/util/errors/InternalServerError'; diff --git a/test/unit/http/ldp/PutOperationHandler.test.ts b/test/unit/http/ldp/PutOperationHandler.test.ts index 22b4db86d..8c82b1807 100644 --- a/test/unit/http/ldp/PutOperationHandler.test.ts +++ b/test/unit/http/ldp/PutOperationHandler.test.ts @@ -2,7 +2,7 @@ import { PutOperationHandler } from '../../../../src/http/ldp/PutOperationHandle import type { Operation } from '../../../../src/http/Operation'; import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation'; import type { Representation } from '../../../../src/http/representation/Representation'; -import { BasicConditions } from '../../../../src/storage/BasicConditions'; +import { BasicConditions } from '../../../../src/storage/conditions/BasicConditions'; import type { ResourceStore } from '../../../../src/storage/ResourceStore'; import { BadRequestHttpError } from '../../../../src/util/errors/BadRequestHttpError'; import { MethodNotAllowedHttpError } from '../../../../src/util/errors/MethodNotAllowedHttpError'; diff --git a/test/unit/storage/DataAccessorBasedStore.test.ts b/test/unit/storage/DataAccessorBasedStore.test.ts index 17a74d01b..8bc2eb52a 100644 --- a/test/unit/storage/DataAccessorBasedStore.test.ts +++ b/test/unit/storage/DataAccessorBasedStore.test.ts @@ -9,7 +9,7 @@ import type { Representation } from '../../../src/http/representation/Representa import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata'; import type { ResourceIdentifier } from '../../../src/http/representation/ResourceIdentifier'; import type { DataAccessor } from '../../../src/storage/accessors/DataAccessor'; -import { BasicConditions } from '../../../src/storage/BasicConditions'; +import { BasicConditions } from '../../../src/storage/conditions/BasicConditions'; import { DataAccessorBasedStore } from '../../../src/storage/DataAccessorBasedStore'; import { INTERNAL_QUADS } from '../../../src/util/ContentTypes'; import { BadRequestHttpError } from '../../../src/util/errors/BadRequestHttpError'; diff --git a/test/unit/storage/BasicConditions.test.ts b/test/unit/storage/conditions/BasicConditions.test.ts similarity index 92% rename from test/unit/storage/BasicConditions.test.ts rename to test/unit/storage/conditions/BasicConditions.test.ts index fa79c6db6..d5b3cfa06 100644 --- a/test/unit/storage/BasicConditions.test.ts +++ b/test/unit/storage/conditions/BasicConditions.test.ts @@ -1,7 +1,7 @@ -import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata'; -import { BasicConditions } from '../../../src/storage/BasicConditions'; -import { getETag } from '../../../src/storage/Conditions'; -import { CONTENT_TYPE, DC } from '../../../src/util/Vocabularies'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; +import { BasicConditions } from '../../../../src/storage/conditions/BasicConditions'; +import { getETag } from '../../../../src/storage/conditions/Conditions'; +import { CONTENT_TYPE, DC } from '../../../../src/util/Vocabularies'; function getMetadata(modified: Date, type = 'application/ld+json'): RepresentationMetadata { return new RepresentationMetadata({ diff --git a/test/unit/storage/Conditions.test.ts b/test/unit/storage/conditions/Conditions.test.ts similarity index 85% rename from test/unit/storage/Conditions.test.ts rename to test/unit/storage/conditions/Conditions.test.ts index 9fe5c706d..d11043968 100644 --- a/test/unit/storage/Conditions.test.ts +++ b/test/unit/storage/conditions/Conditions.test.ts @@ -1,6 +1,6 @@ -import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata'; -import { getETag, sameResourceState } from '../../../src/storage/Conditions'; -import { CONTENT_TYPE, DC } from '../../../src/util/Vocabularies'; +import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata'; +import { getETag, sameResourceState } from '../../../../src/storage/conditions/Conditions'; +import { CONTENT_TYPE, DC } from '../../../../src/util/Vocabularies'; describe('Conditions', (): void => { describe('#getETag', (): void => { diff --git a/test/unit/util/ResourceUtil.test.ts b/test/unit/util/ResourceUtil.test.ts index d70b9187b..b23d47c0c 100644 --- a/test/unit/util/ResourceUtil.test.ts +++ b/test/unit/util/ResourceUtil.test.ts @@ -4,7 +4,7 @@ import type { NamedNode, Literal } from 'n3'; import { BasicRepresentation } from '../../../src/http/representation/BasicRepresentation'; import type { Representation } from '../../../src/http/representation/Representation'; import { RepresentationMetadata } from '../../../src/http/representation/RepresentationMetadata'; -import type { Conditions } from '../../../src/storage/Conditions'; +import type { Conditions } from '../../../src/storage/conditions/Conditions'; import { NotModifiedHttpError } from '../../../src/util/errors/NotModifiedHttpError'; import type { Guarded } from '../../../src/util/GuardedStream'; import {