Skip to content

Created Unregister. #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 15, 2024
Merged

Created Unregister. #136

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db8ce22
This commit being to create unregister on Container and Registrator c…
Oct 4, 2024
f1c2799
Reference removed also of fDependencyOrder, because had occured error…
Oct 4, 2024
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
42 changes: 42 additions & 0 deletions Quick.IOC.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ TIocRegistration<T> = record
function GetKey(aPInfo : PTypeInfo; const aName : string = ''): string;
function RegisterType(aTypeInfo : PTypeInfo; aImplementation : TClass; const aName : string = '') : TIocRegistration;
function RegisterInstance(aTypeInfo : PTypeInfo; const aName : string = '') : TIocRegistration;
procedure Unregister(aTypeInfo : PTypeInfo; const aName : string = '');
end;

TIocRegistrator = class(TInterfacedObject,IIocRegistrator)
Expand All @@ -120,13 +121,16 @@ TIocRegistrator = class(TInterfacedObject,IIocRegistrator)
function RegisterInstance<T : class>(const aName : string = '') : TIocRegistration<T>; overload;
function RegisterInstance<TInterface : IInterface>(aInstance : TInterface; const aName : string = '') : TIocRegistration; overload;
function RegisterOptions<T : TOptions>(aOptions : T) : TIocRegistration<T>;
procedure Unregister<TInterface: IInterface>(const aName : string = ''); overload;
procedure Unregister(aTypeInfo : PTypeInfo; const aName : string = ''); overload;
end;

IIocContainer = interface
['{6A486E3C-C5E8-4BE5-8382-7B9BCCFC1BC3}']
function RegisterType(aInterface: PTypeInfo; aImplementation : TClass; const aName : string = '') : TIocRegistration;
function RegisterInstance(aTypeInfo : PTypeInfo; const aName : string = '') : TIocRegistration;
function Resolve(aServiceType: PTypeInfo; const aName : string = ''): TValue;
procedure Unregister(aTypeInfo : PTypeInfo; const aName : string = '');
procedure Build;
end;

Expand Down Expand Up @@ -214,6 +218,8 @@ TIocContainer = class(TInterfacedObject,IIocContainer)
function AbstractFactory<T : class, constructor> : T; overload;
function RegisterTypedFactory<TFactoryInterface : IInterface; TFactoryType : class, constructor>(const aName : string = '') : TIocRegistration<TTypedFactory<TFactoryType>>;
function RegisterSimpleFactory<TInterface : IInterface; TImplementation : class, constructor>(const aName : string = '') : TIocRegistration;
procedure Unregister<TInterface: IInterface>(const aName : string = ''); overload;
procedure Unregister(aInterface: PTypeInfo; const aName : string = ''); overload;
procedure Build;
end;

Expand Down Expand Up @@ -375,6 +381,17 @@ function TIocContainer.RegisterType(aInterface: PTypeInfo; aImplementation: TCla
Result := fRegistrator.RegisterType(aInterface,aImplementation,aName);
end;

procedure TIocContainer.Unregister<TInterface>(const aName : string = '');
begin
fRegistrator.Unregister<TInterface>(aName);
end;

procedure TIocContainer.Unregister(aInterface: PTypeInfo; const aName : string = '');
begin
fRegistrator.Unregister(aInterface, aName);
end;


function TIocContainer.RegisterInstance<T>(const aName: string): TIocRegistration<T>;
begin
Result := fRegistrator.RegisterInstance<T>(aName);
Expand Down Expand Up @@ -601,6 +618,31 @@ function TIocRegistrator.RegisterType(aTypeInfo : PTypeInfo; aImplementation : T
fDependencyOrder.Add(Result);
end;

procedure TIocRegistrator.Unregister<TInterface>(const aName : string);
begin
Unregister(TypeInfo(TInterface), aName);
end;

procedure TIocRegistrator.Unregister(aTypeInfo : PTypeInfo; const aName : string);
var
key: string;
vValue: TIocRegistration;
begin
key := GetKey(aTypeInfo, aName);

if fDependencies.TryGetValue(key,vValue) then
begin
if (vValue.IntfInfo = aTypeInfo) and (vValue.Name = aName) then
begin
if fDependencyOrder.Contains(vValue) then
fDependencyOrder.Remove(vValue);
fDependencies.Remove(key);
vValue.Free;
end;
end;

end;

{ TIocResolver }

constructor TIocResolver.Create(aRegistrator : TIocRegistrator; aInjector : TIocInjector);
Expand Down