Simplify Adapter serialization

polypheny · May 29, 2024 · 8450e91 · 8450e91
1 parent 577e4c0
commit 8450e91
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 20 deletions.
diff --git a/webui/src/main/java/org/polypheny/db/webui/Crud.java b/webui/src/main/java/org/polypheny/db/webui/Crud.java
@@ -201,7 +201,6 @@
 import org.polypheny.db.webui.models.Uml;
 import org.polypheny.db.webui.models.UnderlyingTables;
 import org.polypheny.db.webui.models.catalog.AdapterModel;
-import org.polypheny.db.webui.models.catalog.AdapterModel.AdapterSettingValueModel;
 import org.polypheny.db.webui.models.catalog.PolyTypeModel;
 import org.polypheny.db.webui.models.catalog.SnapshotModel;
 import org.polypheny.db.webui.models.catalog.UiColumnDefinition;
@@ -2111,13 +2110,13 @@ void createAdapter( final Context ctx ) throws ServletException, IOException {
 
         ConnectionMethod method = ConnectionMethod.UPLOAD;
         if ( a.settings.containsKey( "method" ) ) {
-            method = ConnectionMethod.valueOf( a.settings.get( "method" ).value().toUpperCase() );
+            method = ConnectionMethod.valueOf( a.settings.get( "method" ).toUpperCase() );
         }
         AdapterTemplate adapter = AdapterManager.getAdapterTemplate( a.adapterName, a.type );
         Map<String, AbstractAdapterSetting> allSettings = adapter.settings.stream().collect( Collectors.toMap( e -> e.name, e -> e ) );
 
-        for ( AdapterSettingValueModel entry : a.settings.values() ) {
-            AbstractAdapterSetting set = allSettings.get( entry.name() );
+        for ( Map.Entry<String, String> entry : a.settings.entrySet() ) {
+            AbstractAdapterSetting set = allSettings.get( entry.getKey() );
             if ( set == null ) {
                 continue;
             }
@@ -2128,15 +2127,15 @@ void createAdapter( final Context ctx ) throws ServletException, IOException {
                         ctx.json( RelationalResult.builder().exception( e ).build() );
                         return;
                     }
-                    settings.put( set.name, entry.value() );
+                    settings.put( set.name, entry.getValue() );
                 } else {
-                    List<String> fileNames = HttpServer.mapper.readValue( entry.value(), new TypeReference<>() {
+                    List<String> fileNames = HttpServer.mapper.readValue( entry.getValue(), new TypeReference<>() {
                     } );
                     String directory = handleUploadFiles( inputStreams, fileNames, setting, a );
                     settings.put( set.name, directory );
                 }
             } else {
-                settings.put( set.name, entry.value() );
+                settings.put( set.name, entry.getValue() );
             }
         }
 

diff --git a/webui/src/main/java/org/polypheny/db/webui/models/catalog/AdapterModel.java b/webui/src/main/java/org/polypheny/db/webui/models/catalog/AdapterModel.java
@@ -48,7 +48,7 @@ public class AdapterModel extends IdEntity {
     public AdapterType type;
 
     @JsonProperty
-    public Map<String, AdapterSettingValueModel> settings;
+    public Map<String, String> settings;
 
     @JsonProperty
     public DeployMode mode;
@@ -62,7 +62,7 @@ public AdapterModel(
             @JsonProperty("name") @Nullable String name,
             @JsonProperty("adapterName") String adapterName,
             @JsonProperty("type") AdapterType type,
-            @JsonProperty("settings") Map<String, AdapterSettingValueModel> settings,
+            @JsonProperty("settings") Map<String, String> settings,
             @JsonProperty("mode") DeployMode mode,
             @JsonProperty("indexMethods") List<IndexMethodModel> indexMethods ) {
         super( id, name );
@@ -76,7 +76,7 @@ public AdapterModel(
 
     @Nullable
     public static AdapterModel from( LogicalAdapter adapter ) {
-        Map<String, AdapterSettingValueModel> settings = adapter.settings.entrySet().stream().collect( Collectors.toMap( Entry::getKey, s -> AdapterSettingValueModel.from( s.getKey(), s.getValue() ) ) );
+        Map<String, String> settings = adapter.settings;
 
         Optional<Adapter<?>> a = AdapterManager.getInstance().getAdapter( adapter.id );
         return a.map( dataStore -> new AdapterModel(
@@ -90,14 +90,4 @@ public static AdapterModel from( LogicalAdapter adapter ) {
 
     }
 
-
-    public record AdapterSettingValueModel(@JsonProperty("name") String name, @JsonProperty("value") String value) {
-
-
-        public static AdapterSettingValueModel from( String name, String value ) {
-            return new AdapterSettingValueModel( name, value );
-        }
-
-    }
-
 }