Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
% ------
% Subclasses implement one method:
%
% classdef MyDeserializer < openminds.internal.serializer.BaseDeserializer
% classdef MyDeserializer < openminds.abstract.BaseDeserializer
% methods (Access = protected)
% function rawStructs = parseToStructs(obj, data)
% ...
% end
% end
% end
%
% See also openminds.internal.serializer.BaseSerializer,
% See also openminds.abstract.BaseSerializer,
% openminds.internal.serializer.LinkWiringVisitor

properties (Access = protected)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
% Serialized output in the format specified by the subclass

arguments
obj (1,1) openminds.internal.serializer.BaseSerializer
obj (1,1) openminds.abstract.BaseSerializer
instances % openminds.abstract.Schema or cell array
end

Expand Down
2 changes: 1 addition & 1 deletion code/internal/+openminds/+abstract/Schema.m
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
arguments
obj (1,:) openminds.abstract.Schema
options.NumLinksToResolve = 0
options.LinkResolver openminds.internal.resolver.AbstractLinkResolver
options.LinkResolver openminds.interface.LinkResolver
% options.IsEmbedded = false - Todo?
end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
classdef (Abstract) AbstractLinkResolver < handle
% AbstractLinkResolver - Turns a reference node into a populated instance
classdef (Abstract) LinkResolver < handle
% LinkResolver - Turns a reference node into a populated instance
%
% A resolver knows how to fetch the data behind one kind of identifier.
% It does not walk the graph: traversal, link depth and cycle detection
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
classdef InstanceResolver < openminds.internal.resolver.AbstractLinkResolver
classdef InstanceResolver < openminds.interface.LinkResolver
% InstanceResolver - Resolves openMINDS controlled instances from the local library

properties (Constant)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function addLinkResolver(obj, resolver)
% Add a resolver instance to the registry (no duplicates by handle).
arguments
obj (1,1) openminds.internal.resolver.LinkResolverRegistry
resolver (1,1) {mustBeA(resolver, "openminds.internal.resolver.AbstractLinkResolver")}
resolver (1,1) {mustBeA(resolver, "openminds.interface.LinkResolver")}
end

if obj.hasResolverForPrefix(resolver.IRIPrefix)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
% embedded instance does not, because an embedded instance is part of
% its parent rather than a separate node.
%
% See also openminds.internal.resolver.AbstractLinkResolver
% See also openminds.interface.LinkResolver

properties
% Number of further links to follow.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
classdef JsonLdDeserializer < openminds.internal.serializer.BaseDeserializer
classdef JsonLdDeserializer < openminds.abstract.BaseDeserializer
% JsonLdDeserializer - Reads openMINDS instances from JSON-LD
%
% The counterpart to JsonLdSerializer. Accepts either a single document
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
classdef JsonLdSerializer < openminds.internal.serializer.BaseSerializer
classdef JsonLdSerializer < openminds.abstract.BaseSerializer
%JsonLdSerializer Serializer for JSON-LD format
%
% This class extends BaseSerializer to provide JSON-LD specific
Expand Down Expand Up @@ -26,7 +26,7 @@
config.?openminds.internal.serializer.SerializationConfig
end
nvPairs = namedargs2cell(config);
obj = obj@openminds.internal.serializer.BaseSerializer(nvPairs{:});
obj = obj@openminds.abstract.BaseSerializer(nvPairs{:});
end
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
% A stub naming a controlled instance that is not part of the document
% is resolved from the local instance library instead.
%
% See also openminds.internal.serializer.BaseDeserializer
% See also openminds.abstract.BaseDeserializer

properties (Access = private)
% Identifier to instance, for everything in the document
Expand Down
31 changes: 0 additions & 31 deletions code/internal/+openminds/+internal/+serializer/struct2jsonld.m

This file was deleted.

4 changes: 2 additions & 2 deletions code/internal/+openminds/registerLinkResolver.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ function registerLinkResolver(linkResolver)
% registerLinkResolver - Register a link resolver in the link resolver registry
%
% See also:
% openminds.internal.resolver.AbstractLinkResolver
% openminds.interface.LinkResolver
% openminds.internal.resolver.InstanceResolver

arguments
linkResolver (1,1) {mustBeA(linkResolver, "openminds.internal.resolver.AbstractLinkResolver")}
linkResolver (1,1) {mustBeA(linkResolver, "openminds.interface.LinkResolver")}
end

resolverRegistry = openminds.internal.resolver.LinkResolverRegistry.instance();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
classdef CyclicMockLinkResolver < openminds.internal.resolver.AbstractLinkResolver
classdef CyclicMockLinkResolver < openminds.interface.LinkResolver
%CyclicMockLinkResolver Resolves two ContentType references that link to each other
%
% Resolving the node "a" links it to a reference "b", and resolving "b"
Expand Down
4 changes: 2 additions & 2 deletions tools/tests/+ommtest/+helper/+mock/MockLinkResolver.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
classdef MockLinkResolver < openminds.internal.resolver.AbstractLinkResolver
%MockLinkResolver Mock implementation of AbstractLinkResolver for testing
classdef MockLinkResolver < openminds.interface.LinkResolver
%MockLinkResolver Mock implementation of openminds.interface.LinkResolver for testing
%
% This class provides a mock implementation for testing resolver
% functionality with fake data. It can resolve instances with IRIs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
classdef ReplacingMockLinkResolver < openminds.internal.resolver.AbstractLinkResolver
classdef ReplacingMockLinkResolver < openminds.interface.LinkResolver
%ReplacingMockLinkResolver Resolver that replaces rather than populates
%
% Mirrors the case where the type behind an identifier is not known
Expand Down
Loading