From 5c9f24bdb462b9c488d86b4fe6bd1ead9317bd3f Mon Sep 17 00:00:00 2001
From: Martin Vahlensieck <martin.vahlensieck@unibas.ch>
Date: Wed, 29 May 2024 09:33:01 +0200
Subject: [PATCH] Simplify Adapter serialization

---
 src/app/models/catalog.model.ts              | 10 ----------
 src/app/views/adapters/adapter.model.ts      | 11 +++++++----
 src/app/views/adapters/adapters.component.ts | 13 ++++++-------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/app/models/catalog.model.ts b/src/app/models/catalog.model.ts
index 8de1414a..b486209e 100644
--- a/src/app/models/catalog.model.ts
+++ b/src/app/models/catalog.model.ts
@@ -157,16 +157,6 @@ export interface AdapterSettingModel {
     appliesTo: DeployMode[];
 }
 
-export class AdapterSettingValueModel {
-    name: string;
-    value: string;
-
-    constructor(name: string, value: string) {
-        this.name = name;
-        this.value = value;
-    }
-}
-
 export enum EntityType {
     ENTITY = 'ENTITY',
     SOURCE = 'SOURCE',
diff --git a/src/app/views/adapters/adapter.model.ts b/src/app/views/adapters/adapter.model.ts
index fbbad8cd..04e126c5 100644
--- a/src/app/views/adapters/adapter.model.ts
+++ b/src/app/views/adapters/adapter.model.ts
@@ -1,15 +1,15 @@
 import {IndexMethodModel, ResultException} from '../../components/data-view/models/result-set.model';
-import {AdapterSettingValueModel, DeployMode, IdEntity} from '../../models/catalog.model';
+import {DeployMode, IdEntity} from '../../models/catalog.model';
 
 export class AdapterModel extends IdEntity {
     readonly adapterName: string;
-    readonly settings: Map<string, AdapterSettingValueModel>;
+    readonly settings: Map<string, string>;
     readonly persistent: boolean;
     readonly type: AdapterType;
     readonly mode: DeployMode;
     indexMethods: IndexMethodModel[];
 
-    constructor(uniqueName: string, adapterName: string, settings: Map<string, AdapterSettingValueModel>, persistent: boolean, type: AdapterType, deployMode: DeployMode) {
+    constructor(uniqueName: string, adapterName: string, settings: Map<string, string>, persistent: boolean, type: AdapterType, deployMode: DeployMode) {
         super(-1, uniqueName);
         this.adapterName = adapterName;
         this.settings = settings;
@@ -25,12 +25,13 @@ export enum AdapterType {
     SOURCE = 'SOURCE'
 }
 
+
 export interface AdapterInformation {
     name: string;
     description: string;
     adapterName: string;
     type: string;
-    adapterSettings: AdapterSettingValueModel[];
+    adapterSettings: Map<string, string>;
 }
 
 
@@ -48,6 +49,7 @@ export interface UnderlyingTables {
     underlyingTable: {};
 }
 
+
 export interface MaterializedInfos {
     exception: ResultException;
     materializedInfo: [];
@@ -59,6 +61,7 @@ export enum PlacementType {
     AUTOMATIC = 'AUTOMATIC'
 }
 
+
 export enum PartitionType {
     NONE,
     RANGE,
diff --git a/src/app/views/adapters/adapters.component.ts b/src/app/views/adapters/adapters.component.ts
index ff208220..301eea13 100644
--- a/src/app/views/adapters/adapters.component.ts
+++ b/src/app/views/adapters/adapters.component.ts
@@ -28,7 +28,6 @@ import {Subscription} from 'rxjs';
 import {CatalogService} from '../../services/catalog.service';
 import {
     AdapterSettingModel,
-    AdapterSettingValueModel,
     AdapterTemplateModel,
     DeployMode
 } from '../../models/catalog.model';
@@ -354,7 +353,7 @@ export class AdaptersComponent implements OnInit, OnDestroy {
             }
 
             if (!setting.current) {
-                setting.current = new AdapterSettingValueModel(k, null);
+                setting.current = null;
             }
 
             if (setting.template.type.toLowerCase() === "directory") {
@@ -363,9 +362,9 @@ export class AdaptersComponent implements OnInit, OnDestroy {
                 for (let fileName of setting.template.fileNames) {
                     fd.append(fileName, this.files.get(fileName));
                 }
-                setting.current.value = JSON.stringify(setting.template.fileNames);
+                setting.current = JSON.stringify(setting.template.fileNames);
             } else {
-                setting.current.value = v.value;
+                setting.current = v.value;
             }
 
             deploy.settings.set(k, setting.current);
@@ -644,7 +643,7 @@ class Adapter {
 
         for (const template of adapter.settings) {
             const temp = current === null ? null : current.settings[template.name];
-            const val = new MergedSetting(template, new AdapterSettingValueModel(template.name, template.defaultValue));
+            const val = new MergedSetting(template, template.defaultValue);
             val.current = temp;
 
             settings.set(template.name, val);
@@ -655,9 +654,9 @@ class Adapter {
 
 class MergedSetting {
     template: AdapterSettingModel;
-    current: AdapterSettingValueModel;
+    current: string;
 
-    constructor(template: AdapterSettingModel, current: AdapterSettingValueModel) {
+    constructor(template: AdapterSettingModel, current: string) {
         this.template = template;
         this.current = current;
     }