From 4b726f53d892949749577cb3ad193b4fce152fd7 Mon Sep 17 00:00:00 2001
From: TINCU Sebastian-Ion <Sebastian-Ion.TINCU@ext.ec.europa.eu>
Date: Mon, 17 Sep 2018 13:57:42 +0200
Subject: [PATCH] EDELIVERY-3762 Clean the smp-angular project from domibus
object
Prefer interfaces to classes where applicable.
---
smp-angular/src/app/alerts/alertsentry.ts | 21 ++++++++-----------
smp-angular/src/app/alerts/alertsresult.ts | 18 +++++++---------
.../src/app/appinfo/domibusinfo.service.ts | 2 +-
smp-angular/src/app/appinfo/domibusinfo.ts | 6 ++----
.../searchtable/searchtable-controller.ts | 18 ++++------------
.../common/searchtable/searchtableresult.ts | 15 +++++--------
.../src/app/domain/domain-controller.ts | 20 ++++--------------
smp-angular/src/app/domain/domainresult.ts | 14 +++++--------
smp-angular/src/app/domain/domainro.ts | 17 ++++++---------
smp-angular/src/app/errorlog/errorlogentry.ts | 17 +++++++--------
.../src/app/errorlog/errorlogresult.ts | 21 +++++++++----------
.../messagefilter/messagefilter.component.ts | 18 ++++++++--------
.../app/messagefilter/messagefilterresult.ts | 6 +++---
.../app/messagefilter/routingcriteriaentry.ts | 12 ++++-------
smp-angular/src/app/security/domain.ts | 7 ++-----
smp-angular/src/app/security/user.ts | 7 ++-----
.../servicegroup/servicegroup-controller.ts | 17 ++++-----------
.../src/app/servicegroup/servicegroupro.ts | 20 ++++++------------
.../src/app/truststore/trustore.model.ts | 5 ++---
smp-angular/src/app/user/user-controller.ts | 20 ++++--------------
smp-angular/src/app/user/userro.ts | 12 +++--------
21 files changed, 99 insertions(+), 194 deletions(-)
diff --git a/smp-angular/src/app/alerts/alertsentry.ts b/smp-angular/src/app/alerts/alertsentry.ts
index 6d03991f6..f4b400169 100644
--- a/smp-angular/src/app/alerts/alertsentry.ts
+++ b/smp-angular/src/app/alerts/alertsentry.ts
@@ -1,13 +1,10 @@
-export class AlertsEntry {
- constructor(public processed: boolean,
- public alertId: string,
- public alertType: string,
- public alertLevel: string,
- public alertText: string,
- public creationTime: Date,
- public reportingTime: Date,
- public parameters: string[])
- {
-
- }
+export interface AlertsEntry {
+ processed: boolean;
+ alertId: string;
+ alertType: string;
+ alertLevel: string;
+ alertText: string;
+ creationTime: Date;
+ reportingTime: Date;
+ parameters: string[];
}
diff --git a/smp-angular/src/app/alerts/alertsresult.ts b/smp-angular/src/app/alerts/alertsresult.ts
index 04ebfbf58..5343389e1 100644
--- a/smp-angular/src/app/alerts/alertsresult.ts
+++ b/smp-angular/src/app/alerts/alertsresult.ts
@@ -1,14 +1,10 @@
import {AlertsEntry} from "./alertsentry";
-export class AlertsResult {
-
- constructor(public alertsEntries: Array<AlertsEntry>,
- public pageSize: number,
- public count: number,
- public filter: any,
- public alertsType: Array<string>,
- public alertsLevels: Array<string>
- ) {
-
- }
+export interface AlertsResult {
+ alertsEntries: Array<AlertsEntry>;
+ pageSize: number;
+ count: number;
+ filter: any;
+ alertsType: Array<string>;
+ alertsLevels: Array<string>;
}
diff --git a/smp-angular/src/app/appinfo/domibusinfo.service.ts b/smp-angular/src/app/appinfo/domibusinfo.service.ts
index 5f77bc697..443dba6f5 100644
--- a/smp-angular/src/app/appinfo/domibusinfo.service.ts
+++ b/smp-angular/src/app/appinfo/domibusinfo.service.ts
@@ -16,7 +16,7 @@ export class DomibusInfoService {
let subject = new ReplaySubject();
this.http.get('rest/application/info')
.map((response: Response) => {
- let domibusInfo = new DomibusInfo(response.json().version);
+ const domibusInfo:DomibusInfo = { version: response.json().version };
return domibusInfo;
})
.subscribe((res: DomibusInfo) => {
diff --git a/smp-angular/src/app/appinfo/domibusinfo.ts b/smp-angular/src/app/appinfo/domibusinfo.ts
index cc5af6e74..83a8ef212 100644
--- a/smp-angular/src/app/appinfo/domibusinfo.ts
+++ b/smp-angular/src/app/appinfo/domibusinfo.ts
@@ -1,5 +1,3 @@
-export class DomibusInfo {
-
- constructor(public version:string) {
- }
+export interface DomibusInfo {
+ version:string;
}
diff --git a/smp-angular/src/app/common/searchtable/searchtable-controller.ts b/smp-angular/src/app/common/searchtable/searchtable-controller.ts
index 16cb32050..4bce65d93 100644
--- a/smp-angular/src/app/common/searchtable/searchtable-controller.ts
+++ b/smp-angular/src/app/common/searchtable/searchtable-controller.ts
@@ -1,15 +1,5 @@
-export class SearchTableController {
-
-
- showDetails(row: any) {
-
- }
-
- edit(row: any) {
-
- }
-
- delete(row: any) {
-
- }
+export interface SearchTableController {
+ showDetails(row);
+ edit(row);
+ delete(row);
}
diff --git a/smp-angular/src/app/common/searchtable/searchtableresult.ts b/smp-angular/src/app/common/searchtable/searchtableresult.ts
index f09349b02..9c6c6ad72 100644
--- a/smp-angular/src/app/common/searchtable/searchtableresult.ts
+++ b/smp-angular/src/app/common/searchtable/searchtableresult.ts
@@ -1,11 +1,6 @@
-
-export class SearchTableResult {
-
- constructor(public serviceEntities: Array<any>,
- public pageSize: number,
- public count: number,
- public filter: any
- ) {
-
- }
+export interface SearchTableResult {
+ serviceEntities: Array<any>;
+ pageSize: number;
+ count: number;
+ filter: any;
}
diff --git a/smp-angular/src/app/domain/domain-controller.ts b/smp-angular/src/app/domain/domain-controller.ts
index e650bc376..2913a2e35 100644
--- a/smp-angular/src/app/domain/domain-controller.ts
+++ b/smp-angular/src/app/domain/domain-controller.ts
@@ -2,13 +2,9 @@ import {SearchTableController} from "../common/searchtable/searchtable-controlle
import {MdDialog, MdDialogRef} from "@angular/material";
import {DomainDetailsDialogComponent} from "./domain-details-dialog/domain-details-dialog.component";
+export class DomainController implements SearchTableController {
-export class DomainController extends SearchTableController {
-
- constructor(public dialog: MdDialog) {
- super();
- }
-
+ constructor(public dialog: MdDialog) { }
public showDetails(row: any) {
let dialogRef: MdDialogRef<DomainDetailsDialogComponent> = this.dialog.open(DomainDetailsDialogComponent);
@@ -16,17 +12,9 @@ export class DomainController extends SearchTableController {
dialogRef.afterClosed().subscribe(result => {
//Todo:
});
-
}
+ public edit(row: any) { }
-
-
- public edit(row: any) {
-
- }
-
- public delete(row: any) {
-
- }
+ public delete(row: any) { }
}
diff --git a/smp-angular/src/app/domain/domainresult.ts b/smp-angular/src/app/domain/domainresult.ts
index 57bd728b6..a727245d1 100644
--- a/smp-angular/src/app/domain/domainresult.ts
+++ b/smp-angular/src/app/domain/domainresult.ts
@@ -1,12 +1,8 @@
import {DomainRO} from "./domainro";
-export class DomainResult {
-
- constructor(public serviceEntities: Array<DomainRO>,
- public pageSize: number,
- public count: number,
- public filter: any
- ) {
-
- }
+export interface DomainResult {
+ serviceEntities: Array<DomainRO>;
+ pageSize: number;
+ count: number;
+ filter: any;
}
diff --git a/smp-angular/src/app/domain/domainro.ts b/smp-angular/src/app/domain/domainro.ts
index f13a69c48..1660ccb70 100644
--- a/smp-angular/src/app/domain/domainro.ts
+++ b/smp-angular/src/app/domain/domainro.ts
@@ -1,14 +1,9 @@
-export class DomainRO {
- constructor(public domainId: string,
- public bdmslClientCertHeader: string,
- public bdmslClientCertAlias: string,
- public bdmslSmpId: string,
- public signatureCertAlias: string
-
-
- ) {
-
- }
+export interface DomainRO {
+ domainId: string;
+ bdmslClientCertHeader: string;
+ bdmslClientCertAlias: string;
+ bdmslSmpId: string;
+ signatureCertAlias: string;
}
diff --git a/smp-angular/src/app/errorlog/errorlogentry.ts b/smp-angular/src/app/errorlog/errorlogentry.ts
index 9c6b2a285..9e27c2ba3 100644
--- a/smp-angular/src/app/errorlog/errorlogentry.ts
+++ b/smp-angular/src/app/errorlog/errorlogentry.ts
@@ -1,11 +1,8 @@
-export class ErrorLogEntry {
-
-
- constructor(errorSignalMessageId: string,
- mshRole: string,
- messageInErrorId: string,
- errorCode: string,
- timestamp: Date,
- notified: Date) {
- }
+export interface ErrorLogEntry {
+ errorSignalMessageId: string,
+ mshRole: string;
+ messageInErrorId: string;
+ errorCode: string;
+ timestamp: Date;
+ notified: Date;
}
diff --git a/smp-angular/src/app/errorlog/errorlogresult.ts b/smp-angular/src/app/errorlog/errorlogresult.ts
index ae9114f26..fed43f6ce 100644
--- a/smp-angular/src/app/errorlog/errorlogresult.ts
+++ b/smp-angular/src/app/errorlog/errorlogresult.ts
@@ -1,14 +1,13 @@
import {ErrorLogEntry} from "./errorlogentry";
-export class ErrorLogResult {
- constructor(public errorLogEntries: Array<ErrorLogEntry>,
- // public offset: number,
- public pageSize: number,
- // public orderBy: string,
- // public asc: boolean,
- public count: number,
- public filter: any,
- public mshRoles: Array<string>,
- public errorCodes: Array<string>) {
- }
+export interface ErrorLogResult {
+ errorLogEntries: Array<ErrorLogEntry>;
+ // offset: number;
+ pageSize: number;
+ // orderBy: string;
+ // asc: boolean;
+ count: number;
+ filter: any;
+ mshRoles: Array<string>;
+ errorCodes: Array<string>;
}
diff --git a/smp-angular/src/app/messagefilter/messagefilter.component.ts b/smp-angular/src/app/messagefilter/messagefilter.component.ts
index 53096b7cb..e652745e5 100644
--- a/smp-angular/src/app/messagefilter/messagefilter.component.ts
+++ b/smp-angular/src/app/messagefilter/messagefilter.component.ts
@@ -117,16 +117,16 @@ export class MessageFilterComponent implements DirtyOperations {
if (result == true) {
let routingCriterias: Array<RoutingCriteriaEntry> = [];
if (!isNullOrUndefined(formRef.componentInstance.from) && formRef.componentInstance.from != "") {
- routingCriterias.push(new RoutingCriteriaEntry(0, 'from', formRef.componentInstance.from));
+ routingCriterias.push({ entityId: 0, name: 'from', expression: formRef.componentInstance.from });
}
if (!isNullOrUndefined(formRef.componentInstance.to) && formRef.componentInstance.to != "") {
- routingCriterias.push(new RoutingCriteriaEntry(0, 'to', formRef.componentInstance.to));
+ routingCriterias.push({ entityId: 0, name: 'to', expression: formRef.componentInstance.to });
}
if (!isNullOrUndefined(formRef.componentInstance.action) && formRef.componentInstance.action != "") {
- routingCriterias.push(new RoutingCriteriaEntry(0, 'action', formRef.componentInstance.action));
+ routingCriterias.push({ entityId: 0, name: 'action', expression: formRef.componentInstance.action });
}
if (!isNullOrUndefined(formRef.componentInstance.service) && formRef.componentInstance.service != "") {
- routingCriterias.push(new RoutingCriteriaEntry(0, 'service', formRef.componentInstance.service));
+ routingCriterias.push({ entityId: 0, name: 'service', expression: formRef.componentInstance.service });
}
let backendEntry = new BackendFilterEntry(0, this.rowNumber + 1, formRef.componentInstance.plugin, routingCriterias, false);
if (this.findRowsIndex(backendEntry) == -1) {
@@ -178,16 +178,16 @@ export class MessageFilterComponent implements DirtyOperations {
if (result == true) {
let routingCriterias: Array<RoutingCriteriaEntry> = [];
if (!isNullOrUndefined(formRef.componentInstance.from)) {
- routingCriterias.push(new RoutingCriteriaEntry(0, 'from', formRef.componentInstance.from));
+ routingCriterias.push({ entityId: 0, name: 'from', expression: formRef.componentInstance.from });
}
if (!isNullOrUndefined(formRef.componentInstance.to)) {
- routingCriterias.push(new RoutingCriteriaEntry(0, 'to', formRef.componentInstance.to));
+ routingCriterias.push({ entityId: 0, name: 'to', expression: formRef.componentInstance.to });
}
if (!isNullOrUndefined(formRef.componentInstance.action)) {
- routingCriterias.push(new RoutingCriteriaEntry(0, 'action', formRef.componentInstance.action));
+ routingCriterias.push({ entityId: 0, name: 'action', expression: formRef.componentInstance.action });
}
if (!isNullOrUndefined(formRef.componentInstance.service)) {
- routingCriterias.push(new RoutingCriteriaEntry(0, 'service', formRef.componentInstance.service));
+ routingCriterias.push({ entityId: 0, name: 'service', expression: formRef.componentInstance.service });
}
let backendEntry = new BackendFilterEntry(0, this.rowNumber + 1, formRef.componentInstance.plugin, routingCriterias, false);
let backendEntryPos = this.findRowsIndex(backendEntry);
@@ -224,7 +224,7 @@ export class MessageFilterComponent implements DirtyOperations {
if (value.length == 0) {
return;
}
- let newRC = new RoutingCriteriaEntry(null, rc, value);
+ let newRC = { name: rc, expression: value };
this.rows[this.rowNumber].routingCriterias.push(newRC);
this.createValueProperty(rc, newRC, this.rowNumber);
}
diff --git a/smp-angular/src/app/messagefilter/messagefilterresult.ts b/smp-angular/src/app/messagefilter/messagefilterresult.ts
index 9e98822ed..acd62b75f 100644
--- a/smp-angular/src/app/messagefilter/messagefilterresult.ts
+++ b/smp-angular/src/app/messagefilter/messagefilterresult.ts
@@ -1,6 +1,6 @@
import {BackendFilterEntry} from "./backendfilterentry";
-export class MessageFilterResult {
- constructor(public messageFilterEntries: Array<BackendFilterEntry>, public areFiltersPersisted: boolean) {
- }
+export interface MessageFilterResult {
+ messageFilterEntries: Array<BackendFilterEntry>;
+ areFiltersPersisted: boolean;
}
diff --git a/smp-angular/src/app/messagefilter/routingcriteriaentry.ts b/smp-angular/src/app/messagefilter/routingcriteriaentry.ts
index 44df5794b..05f64a5c6 100644
--- a/smp-angular/src/app/messagefilter/routingcriteriaentry.ts
+++ b/smp-angular/src/app/messagefilter/routingcriteriaentry.ts
@@ -1,9 +1,5 @@
-export class RoutingCriteriaEntry {
-
- public constructor(
- public entityId: number,
- public name: string,
- public expression: string
- ) {
- }
+export interface RoutingCriteriaEntry {
+ entityId?: number;
+ name: string;
+ expression: string;
}
diff --git a/smp-angular/src/app/security/domain.ts b/smp-angular/src/app/security/domain.ts
index aba5088dc..b6af78f78 100644
--- a/smp-angular/src/app/security/domain.ts
+++ b/smp-angular/src/app/security/domain.ts
@@ -1,7 +1,4 @@
-export class Domain {
+export interface Domain {
code: string;
- name: string;
-
- constructor(code: string, name: string) {
- }
+ name: string;
}
diff --git a/smp-angular/src/app/security/user.ts b/smp-angular/src/app/security/user.ts
index f793d56cf..d0042d6c0 100644
--- a/smp-angular/src/app/security/user.ts
+++ b/smp-angular/src/app/security/user.ts
@@ -1,9 +1,6 @@
-export class User {
+export interface User {
id: number;
username: string;
authorities: Array<string>;
- defaultPasswordUsed:boolean;
-
- constructor(id: number, login: string, profile: string, authorities: Array<string>,defaultPasswordUsed:boolean) {
- }
+ defaultPasswordUsed: boolean;
}
diff --git a/smp-angular/src/app/servicegroup/servicegroup-controller.ts b/smp-angular/src/app/servicegroup/servicegroup-controller.ts
index 7e761fac9..cb347f446 100644
--- a/smp-angular/src/app/servicegroup/servicegroup-controller.ts
+++ b/smp-angular/src/app/servicegroup/servicegroup-controller.ts
@@ -6,12 +6,9 @@ import {AlertService} from "../alert/alert.service";
import {ServiceGroupExtensionDialogComponent} from "./servicegroup-extension-dialog/servicegroup-extension-dialog.component";
import {ServicegroupMetadatalistDialogComponent} from "./servicegroup-metadatalist-dialog/servicegroup-metadatalist-dialog.component";
-export class ServiceGroupController extends SearchTableController {
-
- constructor(public dialog: MdDialog) {
- super();
- }
+export class ServiceGroupController implements SearchTableController {
+ constructor(public dialog: MdDialog) { }
public showDetails(row: any) {
let dialogRef: MdDialogRef<ServicegroupDetailsDialogComponent> = this.dialog.open(ServicegroupDetailsDialogComponent);
@@ -19,7 +16,6 @@ export class ServiceGroupController extends SearchTableController {
dialogRef.afterClosed().subscribe(result => {
//Todo:
});
-
}
public showExtension(row: any) {
@@ -36,15 +32,10 @@ export class ServiceGroupController extends SearchTableController {
dialogRef.afterClosed().subscribe(result => {
//Todo:
});
-
}
- public edit(row: any) {
+ public edit(row: any) { }
- }
-
- public delete(row: any) {
-
- }
+ public delete(row: any) { }
}
diff --git a/smp-angular/src/app/servicegroup/servicegroupro.ts b/smp-angular/src/app/servicegroup/servicegroupro.ts
index c733d5084..3e0da84a0 100644
--- a/smp-angular/src/app/servicegroup/servicegroupro.ts
+++ b/smp-angular/src/app/servicegroup/servicegroupro.ts
@@ -1,18 +1,10 @@
-export class ServiceGroupRO {
- constructor(public serviceGroupROId: ServiceGroupROId,
- public domain: string
-
- ) {
-
- }
+export interface ServiceGroupRO {
+ serviceGroupROId: ServiceGroupROId;
+ domain: string;
}
-
-class ServiceGroupROId {
- constructor(public participantId: string,
- public participantSchema: string
- ) {
-
- }
+export interface ServiceGroupROId {
+ participantId: string;
+ participantSchema: string;
}
diff --git a/smp-angular/src/app/truststore/trustore.model.ts b/smp-angular/src/app/truststore/trustore.model.ts
index e8371127f..61fac5301 100644
--- a/smp-angular/src/app/truststore/trustore.model.ts
+++ b/smp-angular/src/app/truststore/trustore.model.ts
@@ -1,9 +1,8 @@
/**
* @author Thomas Dussart
- * @since 3.3
*/
-export class TrustStoreEntry {
- name: string
+export interface TrustStoreEntry {
+ name: string;
subject: string;
issuer: string;
validFrom: string;
diff --git a/smp-angular/src/app/user/user-controller.ts b/smp-angular/src/app/user/user-controller.ts
index 22bc02d8d..37f2f6171 100644
--- a/smp-angular/src/app/user/user-controller.ts
+++ b/smp-angular/src/app/user/user-controller.ts
@@ -2,13 +2,9 @@ import {SearchTableController} from "../common/searchtable/searchtable-controlle
import {MdDialog, MdDialogRef} from "@angular/material";
import {UserDetailsDialogComponent} from "./user-details-dialog/user-details-dialog.component";
+export class UserController implements SearchTableController {
-export class UserController extends SearchTableController {
-
- constructor(public dialog: MdDialog) {
- super();
- }
-
+ constructor(public dialog: MdDialog) { }
public showDetails(row: any) {
let dialogRef: MdDialogRef<UserDetailsDialogComponent> = this.dialog.open(UserDetailsDialogComponent);
@@ -16,17 +12,9 @@ export class UserController extends SearchTableController {
dialogRef.afterClosed().subscribe(result => {
//Todo:
});
-
}
+ public edit(row: any) { }
-
-
- public edit(row: any) {
-
- }
-
- public delete(row: any) {
-
- }
+ public delete(row: any) { }
}
diff --git a/smp-angular/src/app/user/userro.ts b/smp-angular/src/app/user/userro.ts
index 1220afa7f..c6a1cd2d4 100644
--- a/smp-angular/src/app/user/userro.ts
+++ b/smp-angular/src/app/user/userro.ts
@@ -1,10 +1,4 @@
-export class UserRO {
- constructor(public username: string,
- public admin: string,
- ) {
-
- }
+export interface UserRO {
+ username: string;
+ admin: string;
}
-
-
-
--
GitLab