Migrate to @angular-eslint/prefer-inject and @typescript-eslint/prefer-readonly (#11665)

lib/core/api/src/lib/adf-http-client.service.spec.ts

@@ -16,8 +16,8 @@
  */
 
 import { Emitters, RequestOptions, ResultListDataRepresentationTaskRepresentation, SecurityOptions } from '@alfresco/js-api';
-import { HttpParams } from '@angular/common/http';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { HttpParams, provideHttpClient } from '@angular/common/http';
+import { HttpTestingController, provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { AdfHttpClient } from './adf-http-client.service';
 import { AlfrescoApiResponseError } from './alfresco-api/alfresco-api.response-error';
@@ -52,8 +52,7 @@ describe('AdfHttpClient', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [HttpClientTestingModule],
-            providers: [AdfHttpClient]
+            providers: [AdfHttpClient, provideHttpClient(), provideHttpClientTesting()]
         });
         angularHttpClient = TestBed.inject(AdfHttpClient);
         controller = TestBed.inject(HttpTestingController);

lib/core/api/src/lib/adf-http-client.service.ts

@@ -18,7 +18,7 @@
 import { SHOULD_ADD_AUTH_TOKEN } from '@alfresco/adf-core/auth';
 import { Emitters as JsApiEmitters, HttpClient as JsApiHttpClient, EventEmitterInstance, EventEmitterEvents } from '@alfresco/js-api';
 import { HttpClient, HttpContext, HttpErrorResponse, HttpEvent, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { lastValueFrom, Observable, of, Subject, throwError } from 'rxjs';
 import { catchError, map, takeUntil } from 'rxjs/operators';
 import {
@@ -45,7 +45,9 @@ export interface Emitters {
     providedIn: 'root'
 })
 export class AdfHttpClient implements JsApiHttpClient {
-    private eventEmitter = new EventEmitter();
+    private readonly httpClient = inject(HttpClient);
+
+    private readonly eventEmitter = new EventEmitter();
 
     _disableCsrf: boolean;
 
@@ -64,10 +66,6 @@ export class AdfHttpClient implements JsApiHttpClient {
         defaultHeaders: {}
     };
 
-    constructor(private httpClient: HttpClient) {
-        // No need for ee(this) anymore - we use composition instead of inheritance
-    }
-
     // EventEmitter delegation methods
     on(event: EventEmitterEvents, fn: (...args: any[]) => void, context?: any): this {
         this.eventEmitter.on(event, fn, context);