This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 17a5b6ee7f refactor: Replace constructor injection with inject()
(#3789)
17a5b6ee7f is described below
commit 17a5b6ee7fcfc37050d6c3982a0307182b3f6352
Author: Philipp Zehnder <[email protected]>
AuthorDate: Tue Sep 23 12:46:06 2025 +0200
refactor: Replace constructor injection with inject() (#3789)
---
.../src/lib/apis/abstract-monitoring.service.ts | 7 +--
.../src/lib/apis/adapter-monitoring.service.ts | 9 ---
.../src/lib/apis/adapter.service.ts | 12 ++--
.../src/lib/apis/asset-management.service.ts | 8 +--
.../src/lib/apis/chart.service.ts | 8 +--
.../src/lib/apis/commons.service.ts | 2 -
.../src/lib/apis/compact-pipeline.service.ts | 8 +--
.../src/lib/apis/dashboard.service.ts | 8 +--
.../src/lib/apis/datalake-rest.service.ts | 4 +-
.../src/lib/apis/extension-installation.service.ts | 18 +++---
.../src/lib/apis/files.service.ts | 8 +--
.../src/lib/apis/functions.service.ts | 8 +--
.../src/lib/apis/general-config.service.ts | 8 +--
.../src/lib/apis/generic-storage.service.ts | 8 +--
.../src/lib/apis/labels.service.ts | 4 +-
.../src/lib/apis/location-config.service.ts | 8 +--
.../src/lib/apis/mail-config.service.ts | 8 +--
.../src/lib/apis/measurement-units.service.ts | 8 +--
.../src/lib/apis/permissions.service.ts | 8 +--
.../lib/apis/pipeline-canvas-metadata.service.ts | 8 +--
.../src/lib/apis/pipeline-element-asset.service.ts | 2 -
.../lib/apis/pipeline-element-template.service.ts | 8 +--
.../src/lib/apis/pipeline-element.service.ts | 8 +--
.../src/lib/apis/pipeline-monitoring.service.ts | 28 ++++++---
.../src/lib/apis/pipeline-template.service.ts | 4 +-
.../src/lib/apis/pipeline.service.spec.ts | 73 ----------------------
.../src/lib/apis/pipeline.service.ts | 8 +--
.../src/lib/apis/privilege.service.ts | 8 +--
.../platform-services/src/lib/apis/role.service.ts | 8 +--
.../src/lib/apis/semantic-types-rest.service.ts | 8 +--
.../src/lib/apis/service-tags.service.ts | 8 +--
.../src/lib/apis/shared-dashboard.service.ts | 4 +-
.../src/lib/apis/user-admin.service.ts | 8 +--
.../src/lib/apis/user-group.service.ts | 8 +--
.../platform-services/src/lib/apis/user.service.ts | 8 +--
35 files changed, 113 insertions(+), 238 deletions(-)
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/abstract-monitoring.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/abstract-monitoring.service.ts
index bfd79f77c1..e5458bc817 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/abstract-monitoring.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/abstract-monitoring.service.ts
@@ -19,12 +19,11 @@
import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
import { PlatformServicesCommons } from './commons.service';
+import { inject } from '@angular/core';
export abstract class AbstractMonitoringService {
- constructor(
- protected http: HttpClient,
- protected platformServicesCommons: PlatformServicesCommons,
- ) {}
+ protected http = inject(HttpClient);
+ protected platformServicesCommons = inject(PlatformServicesCommons);
triggerMonitoringUpdate(): Observable<any> {
return this.http.get(this.monitoringBasePath);
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/adapter-monitoring.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/adapter-monitoring.service.ts
index a208e6822c..6247d6d643 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/adapter-monitoring.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/adapter-monitoring.service.ts
@@ -17,10 +17,8 @@
*/
import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { SpLogEntry, SpMetricsEntry } from '../model/gen/streampipes-model';
-import { PlatformServicesCommons } from './commons.service';
import { map } from 'rxjs/operators';
import { AbstractMonitoringService } from './abstract-monitoring.service';
@@ -28,13 +26,6 @@ import { AbstractMonitoringService } from
'./abstract-monitoring.service';
providedIn: 'root',
})
export class AdapterMonitoringService extends AbstractMonitoringService {
- constructor(
- http: HttpClient,
- platformServicesCommons: PlatformServicesCommons,
- ) {
- super(http, platformServicesCommons);
- }
-
getLogInfoForAdapter(elementId: string): Observable<SpLogEntry[]> {
return this.http
.get(this.logUrl(elementId))
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/adapter.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/adapter.service.ts
index fcd293a0ff..e1c8d6ed8c 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/adapter.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/adapter.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';
@@ -29,12 +29,12 @@ import {
PipelineUpdateInfo,
} from '../model/gen/streampipes-model';
-@Injectable({ providedIn: 'root' })
+@Injectable({
+ providedIn: 'root',
+})
export class AdapterService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
get connectPath() {
return `${this.platformServicesCommons.apiBasePath}/connect`;
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/asset-management.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/asset-management.service.ts
index 72d9d31070..621ebe0bed 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/asset-management.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/asset-management.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { PlatformServicesCommons } from './commons.service';
import { Observable } from 'rxjs';
@@ -25,10 +25,8 @@ import { Observable } from 'rxjs';
providedIn: 'root',
})
export class AssetManagementService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
createAsset(asset: any): Observable<any> {
return this.http.post(this.assetBasePath, asset);
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/chart.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/chart.service.ts
index f14946c697..57d77b9d90 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/chart.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/chart.service.ts
@@ -19,7 +19,7 @@
import { HttpClient } from '@angular/common/http';
import { catchError, Observable, throwError } from 'rxjs';
import { map } from 'rxjs/operators';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import {
DataExplorerWidgetModel,
DataLakeMeasure,
@@ -30,10 +30,8 @@ import { TranslateService } from '@ngx-translate/core';
providedIn: 'root',
})
export class ChartService {
- constructor(
- private http: HttpClient,
- private translateService: TranslateService,
- ) {}
+ private http = inject(HttpClient);
+ private translateService = inject(TranslateService);
getAllCharts(): Observable<DataExplorerWidgetModel[]> {
return this.http
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/commons.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/commons.service.ts
index 1a3c7b3d58..50083ce6cc 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/commons.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/commons.service.ts
@@ -22,8 +22,6 @@ import { Injectable } from '@angular/core';
providedIn: 'root',
})
export class PlatformServicesCommons {
- constructor() {}
-
get basePath(): string {
return '/streampipes-backend';
}
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/compact-pipeline.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/compact-pipeline.service.ts
index 49e3d5d4da..6e69e9cfed 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/compact-pipeline.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/compact-pipeline.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { PlatformServicesCommons } from './commons.service';
@@ -26,10 +26,8 @@ import { CompactPipeline } from
'../model/gen/streampipes-model';
providedIn: 'root',
})
export class CompactPipelineService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
create(pipeline: CompactPipeline): Observable<any> {
return this.http.post(this.baseUrl, pipeline);
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/dashboard.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/dashboard.service.ts
index cd0618bd8b..06dee0d3bc 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/dashboard.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/dashboard.service.ts
@@ -17,7 +17,7 @@
*/
import { HttpClient, HttpContext, HttpResponse } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { SharedDatalakeRestService } from './shared-dashboard.service';
import {
@@ -30,10 +30,8 @@ import { NGX_LOADING_BAR_IGNORED } from
'@ngx-loading-bar/http-client';
providedIn: 'root',
})
export class DashboardService {
- constructor(
- private http: HttpClient,
- private sharedDatalakeRestService: SharedDatalakeRestService,
- ) {}
+ private http = inject(HttpClient);
+ private sharedDatalakeRestService = inject(SharedDatalakeRestService);
getDashboards(): Observable<Dashboard[]> {
return this.sharedDatalakeRestService.getDashboards(this.dashboardUrl);
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/datalake-rest.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/datalake-rest.service.ts
index d53de8815f..5009e20a18 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/datalake-rest.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/datalake-rest.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import {
HttpClient,
HttpContext,
@@ -34,7 +34,7 @@ import { NGX_LOADING_BAR_IGNORED } from
'@ngx-loading-bar/http-client';
providedIn: 'root',
})
export class DatalakeRestService {
- constructor(private http: HttpClient) {}
+ private http = inject(HttpClient);
private get baseUrl() {
return '/streampipes-backend';
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/extension-installation.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/extension-installation.service.ts
index 8381a79ab9..2e0515c5fd 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/extension-installation.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/extension-installation.service.ts
@@ -1,9 +1,3 @@
-import { Injectable } from '@angular/core';
-import { HttpClient, HttpParams } from '@angular/common/http';
-import { PlatformServicesCommons } from './commons.service';
-import { Observable } from 'rxjs';
-import { ExtensionItemInstallationRequest } from
'../model/gen/streampipes-model';
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -22,14 +16,18 @@ import { ExtensionItemInstallationRequest } from
'../model/gen/streampipes-model
*
*/
+import { inject, Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { PlatformServicesCommons } from './commons.service';
+import { Observable } from 'rxjs';
+import { ExtensionItemInstallationRequest } from
'../model/gen/streampipes-model';
+
@Injectable({
providedIn: 'root',
})
export class ExtensionInstallationService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
add(
installationRequest: ExtensionItemInstallationRequest,
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/files.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/files.service.ts
index e2c1423150..650db633c4 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/files.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/files.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import {
HttpClient,
HttpEvent,
@@ -32,10 +32,8 @@ import { FileMetadata } from
'../model/gen/streampipes-model';
providedIn: 'root',
})
export class FilesService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
uploadFile(file: File): Observable<HttpEvent<any>> {
const data: FormData = new FormData();
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/functions.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/functions.service.ts
index 3375f2e592..7b3bf581b8 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/functions.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/functions.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { PlatformServicesCommons } from './commons.service';
import {
@@ -31,10 +31,8 @@ import { map } from 'rxjs/operators';
providedIn: 'root',
})
export class FunctionsService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
public getActiveFunctions(): Observable<FunctionDefinition[]> {
return this.http
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/general-config.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/general-config.service.ts
index 7e491c1b7f..ffcf2d29d7 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/general-config.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/general-config.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';
import { Observable } from 'rxjs';
@@ -27,10 +27,8 @@ import { GeneralConfigModel } from
'../model/config/general-config.model';
providedIn: 'root',
})
export class GeneralConfigService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
getGeneralConfig(): Observable<GeneralConfigModel> {
return this.http
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/generic-storage.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/generic-storage.service.ts
index 6f18f3f3a3..d1a20b4a4c 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/generic-storage.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/generic-storage.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { PlatformServicesCommons } from './commons.service';
import { Observable } from 'rxjs';
@@ -25,10 +25,8 @@ import { Observable } from 'rxjs';
providedIn: 'root',
})
export class GenericStorageService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
createDocument(appDocType: string, document: any): Observable<any> {
return this.http.post(this.getAppDocPath(appDocType), document);
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/labels.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/labels.service.ts
index 025229fe0d..b5db0c258f 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/labels.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/labels.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { SpLabel } from '../model/labels/labels.model';
import { Observable } from 'rxjs';
import { GenericStorageService } from './generic-storage.service';
@@ -27,7 +27,7 @@ import { GenericStorageService } from
'./generic-storage.service';
export class LabelsService {
appDocType = 'sp-labels';
- constructor(private genericStorageService: GenericStorageService) {}
+ private genericStorageService = inject(GenericStorageService);
getAllLabels(): Observable<SpLabel[]> {
return this.genericStorageService.getAllDocuments(this.appDocType);
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/location-config.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/location-config.service.ts
index d07e8b8e13..d83b204e1a 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/location-config.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/location-config.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
@@ -27,10 +27,8 @@ import { LocationConfig } from
'../model/gen/streampipes-model';
providedIn: 'root',
})
export class LocationConfigService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
getLocationConfig(): Observable<LocationConfig> {
return this.http
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/mail-config.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/mail-config.service.ts
index 35a68779d6..3bb4c40483 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/mail-config.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/mail-config.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';
import { Observable } from 'rxjs';
@@ -27,10 +27,8 @@ import { EmailConfig, EmailTemplate } from
'../model/config/email-config.model';
providedIn: 'root',
})
export class MailConfigService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
getMailConfig(): Observable<EmailConfig> {
return this.http
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/measurement-units.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/measurement-units.service.ts
index 09869650b7..a73b31d939 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/measurement-units.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/measurement-units.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { PlatformServicesCommons } from './commons.service';
import { Observable } from 'rxjs';
@@ -26,10 +26,8 @@ import { MeasurementUnit } from
'../model/measurement-unit/MeasurementUnit';
providedIn: 'root',
})
export class MeasurementUnitsService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
getAllMeasurementUnits(): Observable<MeasurementUnit[]> {
return this.http.get<MeasurementUnit[]>(
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/permissions.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/permissions.service.ts
index db1cf9b4d7..0f98e496e4 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/permissions.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/permissions.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { PlatformServicesCommons } from './commons.service';
import { Observable } from 'rxjs';
@@ -27,10 +27,8 @@ import { Permission } from
'../model/gen/streampipes-model-client';
providedIn: 'root',
})
export class PermissionsService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
public getPermissionsForObject(
objectInstanceId: string,
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-canvas-metadata.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-canvas-metadata.service.ts
index 1e15361445..4babb0052b 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-canvas-metadata.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-canvas-metadata.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { PipelineCanvasMetadata } from '../model/gen/streampipes-model';
@@ -27,10 +27,8 @@ import { map } from 'rxjs/operators';
providedIn: 'root',
})
export class PipelineCanvasMetadataService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
addPipelineCanvasMetadata(pipelineCanvasMetadata: PipelineCanvasMetadata) {
return this.http.post(
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-element-asset.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-element-asset.service.ts
index cc2d6794dc..ae94de1dd6 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-element-asset.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-element-asset.service.ts
@@ -17,14 +17,12 @@
*/
import { inject, Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
import { PlatformServicesCommons } from './commons.service';
@Injectable({
providedIn: 'root',
})
export class PipelineElementAssetService {
- private http = inject(HttpClient);
private platformServicesCommons = inject(PlatformServicesCommons);
getAssetUrl(appId) {
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-element-template.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-element-template.service.ts
index 953a8511b7..4da8536927 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-element-template.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-element-template.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import {
@@ -32,10 +32,8 @@ import { map } from 'rxjs/operators';
providedIn: 'root',
})
export class PipelineElementTemplateService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
getPipelineElementTemplates(
appId: string,
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-element.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-element.service.ts
index 463175fc75..e6e843779f 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-element.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-element.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import {
@@ -31,10 +31,8 @@ import { map } from 'rxjs/operators';
providedIn: 'root',
})
export class PipelineElementService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
getDataProcessors(): Observable<DataProcessorInvocation[]> {
return this.http.get(this.dataProcessorsUrl).pipe(
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-monitoring.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-monitoring.service.ts
index c597578f7f..c9094960fa 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-monitoring.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-monitoring.service.ts
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -17,10 +35,9 @@
*/
import { Injectable } from '@angular/core';
-import { HttpClient, HttpContext } from '@angular/common/http';
+import { HttpContext } from '@angular/common/http';
import { Observable } from 'rxjs';
import { SpLogEntry, SpMetricsEntry } from '../model/gen/streampipes-model';
-import { PlatformServicesCommons } from './commons.service';
import { map } from 'rxjs/operators';
import { AbstractMonitoringService } from './abstract-monitoring.service';
@@ -28,13 +45,6 @@ import { AbstractMonitoringService } from
'./abstract-monitoring.service';
providedIn: 'root',
})
export class PipelineMonitoringService extends AbstractMonitoringService {
- constructor(
- http: HttpClient,
- platformServicesCommons: PlatformServicesCommons,
- ) {
- super(http, platformServicesCommons);
- }
-
getLogInfoForPipeline(
pipelineId: string,
context?: HttpContext,
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-template.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-template.service.ts
index abd4ccf764..712f7c4b03 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-template.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline-template.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import {
CompactPipelineTemplate,
@@ -30,7 +30,7 @@ import { Observable } from 'rxjs';
providedIn: 'root',
})
export class PipelineTemplateService {
- constructor(private http: HttpClient) {}
+ private http = inject(HttpClient);
getServerUrl() {
return '/streampipes-backend';
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline.service.spec.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline.service.spec.ts
deleted file mode 100644
index 9fb85d7e64..0000000000
---
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline.service.spec.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import { TestBed } from '@angular/core/testing';
-import { PipelineService } from './pipeline.service';
-import {
- HttpTestingController,
- provideHttpClientTesting,
-} from '@angular/common/http/testing';
-import { Pipeline } from '../model/gen/streampipes-model';
-import {
- provideHttpClient,
- withInterceptorsFromDi,
-} from '@angular/common/http';
-
-describe('PipelineService', () => {
- const mockPath = 'mock';
- let pipelineService: PipelineService;
- let httpMock: HttpTestingController;
-
- beforeEach(() => {
- TestBed.configureTestingModule({
- imports: [],
- providers: [
- provideHttpClient(withInterceptorsFromDi()),
- provideHttpClientTesting(),
- ],
- });
- httpMock = TestBed.inject(HttpTestingController);
- pipelineService = TestBed.inject(PipelineService);
- spyOnProperty(pipelineService, 'apiBasePath', 'get').and.returnValue(
- mockPath,
- );
- });
-
- it('Get pipelines containing element', () => {
- const elementId = 'elementId';
- const expectedPipeline = new Pipeline();
- expectedPipeline.name = 'Test Pipeline';
- const expectedPipelines = [expectedPipeline];
-
- pipelineService
- .getPipelinesContainingElementId(elementId)
- .subscribe(pipelines => {
- expect(pipelines.length).toBe(1);
- expect(pipelines[0]).toEqual(
- jasmine.objectContaining(expectedPipeline),
- );
- });
-
- const req = httpMock.expectOne({
- method: 'GET',
- url: `${mockPath}/pipelines/contains/${elementId}`,
- });
-
- req.flush(expectedPipelines);
- });
-});
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline.service.ts
index de5c37517e..1e6ff20a09 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/pipeline.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/pipeline.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { PlatformServicesCommons } from './commons.service';
import { Observable } from 'rxjs';
@@ -35,10 +35,8 @@ import { map } from 'rxjs/operators';
providedIn: 'root',
})
export class PipelineService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
startPipeline(pipelineId: string): Observable<PipelineOperationStatus> {
return this.http
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/privilege.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/privilege.service.ts
index caceae90c8..1a315bf227 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/privilege.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/privilege.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { PlatformServicesCommons } from './commons.service';
@@ -26,10 +26,8 @@ import { Privilege } from
'../model/gen/streampipes-model-client';
providedIn: 'root',
})
export class PrivilegeService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
findAll(): Observable<Privilege[]> {
return this.http.get<Privilege[]>(this.privilegesBasePath);
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/role.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/role.service.ts
index e71d0daf0e..9dba83e7df 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/role.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/role.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { PlatformServicesCommons } from './commons.service';
@@ -26,10 +26,8 @@ import { Role } from '../model/gen/streampipes-model-client';
providedIn: 'root',
})
export class RoleService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
findAll(): Observable<Role[]> {
return this.http.get<Role[]>(this.privilegesBasePath);
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/semantic-types-rest.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/semantic-types-rest.service.ts
index 00b729fa92..743b3f0234 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/semantic-types-rest.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/semantic-types-rest.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { PlatformServicesCommons } from './commons.service';
import { map } from 'rxjs/operators';
@@ -26,10 +26,8 @@ import { Observable } from 'rxjs';
providedIn: 'root',
})
export class SemanticTypesRestService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
getSemanticTypes(text: string): Observable<string[]> {
return this.http
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/service-tags.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/service-tags.service.ts
index 2dd4755377..17229a12f8 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/service-tags.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/service-tags.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { PlatformServicesCommons } from './commons.service';
import { Observable } from 'rxjs';
@@ -27,10 +27,8 @@ import { map } from 'rxjs/operators';
providedIn: 'root',
})
export class ServiceTagService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
getCustomServiceTags(): Observable<SpServiceTag[]> {
return this.http
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/shared-dashboard.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/shared-dashboard.service.ts
index 90f6e28554..def1eaf70f 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/shared-dashboard.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/shared-dashboard.service.ts
@@ -17,7 +17,7 @@
*/
import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { map } from 'rxjs/operators';
import { Observable } from 'rxjs';
import { Dashboard } from '../model/dashboard/dashboard.model';
@@ -26,7 +26,7 @@ import { Dashboard } from
'../model/dashboard/dashboard.model';
providedIn: 'root',
})
export class SharedDatalakeRestService {
- constructor(private http: HttpClient) {}
+ private http = inject(HttpClient);
getDashboards(dashboardUrl: string): Observable<Dashboard[]> {
return this.http.get(dashboardUrl).pipe(
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/user-admin.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/user-admin.service.ts
index 25313f3aff..f3686e03d1 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/user-admin.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/user-admin.service.ts
@@ -24,16 +24,14 @@ import {
import { map } from 'rxjs/operators';
import { HttpClient } from '@angular/common/http';
import { PlatformServicesCommons } from './commons.service';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
@Injectable({
providedIn: 'root',
})
export class UserAdminService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
getAllUserAccounts(): Observable<UserAccount[]> {
return this.http.get(`${this.usersAdminPath}?type=USER_ACCOUNT`).pipe(
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/user-group.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/user-group.service.ts
index 3749d1f571..9c3e07e82c 100644
---
a/ui/projects/streampipes/platform-services/src/lib/apis/user-group.service.ts
+++
b/ui/projects/streampipes/platform-services/src/lib/apis/user-group.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';
import { Observable } from 'rxjs';
@@ -27,10 +27,8 @@ import { Group } from
'../model/gen/streampipes-model-client';
providedIn: 'root',
})
export class UserGroupService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
public getAllUserGroups(): Observable<Group[]> {
return this.http.get(`${this.userGroupPath}`).pipe(
diff --git
a/ui/projects/streampipes/platform-services/src/lib/apis/user.service.ts
b/ui/projects/streampipes/platform-services/src/lib/apis/user.service.ts
index 48749d7d36..a953c2dba1 100644
--- a/ui/projects/streampipes/platform-services/src/lib/apis/user.service.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/apis/user.service.ts
@@ -16,7 +16,7 @@
*
*/
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { map } from 'rxjs/operators';
import { Observable } from 'rxjs';
@@ -32,10 +32,8 @@ import { ShortUserInfo } from
'../model/gen/streampipes-model';
providedIn: 'root',
})
export class UserService {
- constructor(
- private http: HttpClient,
- private platformServicesCommons: PlatformServicesCommons,
- ) {}
+ private http = inject(HttpClient);
+ private platformServicesCommons = inject(PlatformServicesCommons);
public listUsers(): Observable<ShortUserInfo[]> {
return this.http.get(this.usersPath).pipe(
