Revert "dbeaver/pro#7415 Simplify platform configuration (dbeaver#39602)"

serge-rider · serge-rider · commit ca151d7a07bd · 2025-11-13T17:26:19.000+01:00
This reverts commit ad27aff.
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DesktopPlatform.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DesktopPlatform.java
@@ -17,14 +17,12 @@
 
 package org.jkiss.dbeaver.core;
 
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.ui.PlatformUI;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.DBeaverPreferences;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.model.DBConfigurationController;
 import org.jkiss.dbeaver.model.DBConstants;
 import org.jkiss.dbeaver.model.DBPExternalFileManager;
 import org.jkiss.dbeaver.model.app.*;
@@ -50,7 +48,6 @@
 import org.jkiss.dbeaver.utils.SystemVariablesResolver;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.StandardConstants;
-import org.osgi.framework.Bundle;
 
 import java.io.File;
 import java.io.IOException;
@@ -321,15 +318,4 @@ public boolean isShuttingDown() {
         return isClosing();
     }
 
-    @NotNull
-    @Override
-    public DBConfigurationController getPluginConfigurationController(@NotNull String pluginId) {
-        Bundle bundle = Platform.getBundle(pluginId);
-        if (bundle == null) {
-            throw new IllegalStateException("Bundle '" + pluginId + "' not found");
-        }
-        return getConfigurationController(bundle);
-    }
-
-
 }
diff --git a/plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/registry/GeometryViewerRegistry.java b/plugins/org.jkiss.dbeaver.data.gis.view/src/org/jkiss/dbeaver/ui/gis/registry/GeometryViewerRegistry.java
@@ -121,7 +121,7 @@ private static void populateFromConfig(
         @NotNull Collection<String> notVisiblePredefinedTilesIds,
         @NotNull Collection<LeafletTilesDescriptor> userDefinedTiles
     ) throws DBException {
-        String content = DBWorkbench.getPlatform().getConfigurationController().loadConfigurationFile(GEOMETRY_REGISTRY_CONFIG_XML);
+        String content = DBWorkbench.getPlatform().getProductConfigurationController().loadConfigurationFile(GEOMETRY_REGISTRY_CONFIG_XML);
         if (CommonUtils.isEmpty(content)) {
             return;
         }
@@ -296,7 +296,7 @@ private void flushConfig() {
             xmlBuilder.flush();
             out.flush();
             
-            DBWorkbench.getPlatform().getConfigurationController()
+            DBWorkbench.getPlatform().getProductConfigurationController()
                 .saveConfigurationFile(GEOMETRY_REGISTRY_CONFIG_XML, out.getBuffer().toString());
         } catch (Throwable e) {
             log.error("Error saving " + GeometryViewerRegistry.class.getName() + " configuration");
diff --git a/plugins/org.jkiss.dbeaver.headless/src/org/jkiss/dbeaver/headless/DBeaverTestPlatform.java b/plugins/org.jkiss.dbeaver.headless/src/org/jkiss/dbeaver/headless/DBeaverTestPlatform.java
@@ -18,11 +18,9 @@
 package org.jkiss.dbeaver.headless;
 
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.model.DBConfigurationController;
 import org.jkiss.dbeaver.model.DBConstants;
 import org.jkiss.dbeaver.model.DBPExternalFileManager;
 import org.jkiss.dbeaver.model.app.*;
@@ -180,12 +178,6 @@ public DBPExternalFileManager getExternalFileManager() {
         return workspace;
     }
 
-    @NotNull
-    @Override
-    public DBConfigurationController getPluginConfigurationController(@NotNull String pluginId) {
-        return getConfigurationController(Platform.getBundle(pluginId));
-    }
-
     @Override
     public boolean isWorkbenchStarted() {
         return true;
diff --git a/plugins/org.jkiss.dbeaver.model.dashboard/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.model.dashboard/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Export-Package: org.jkiss.dbeaver.model.dashboard,
 Require-Bundle: org.eclipse.core.expressions,
  org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.registry;visibility:=reexport,
- org.jkiss.dbeaver.model.rcp,
  com.google.gson
 Bundle-Localization: OSGI-INF/l10n/bundle
 Automatic-Module-Name: org.jkiss.dbeaver.model.dashboard
diff --git a/plugins/org.jkiss.dbeaver.model.dashboard/src/org/jkiss/dbeaver/model/dashboard/registry/DashboardRegistry.java b/plugins/org.jkiss.dbeaver.model.dashboard/src/org/jkiss/dbeaver/model/dashboard/registry/DashboardRegistry.java
@@ -26,7 +26,6 @@
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.DBPNamedObject;
 import org.jkiss.dbeaver.model.WorkspaceConfigEventManager;
-import org.jkiss.dbeaver.model.app.DBPPlatformDesktop;
 import org.jkiss.dbeaver.model.connection.DBPDataSourceProviderDescriptor;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.dashboard.DBDashboardContext;
@@ -99,11 +98,11 @@ private void loadConfigFromFile() {
                 .loadConfigurationFile(CONFIG_FILE_NAME);
             if (CommonUtils.isEmpty(configContent) && !DBWorkbench.isDistributed()) {
                 // Backward compatibility
-                configContent = DBPPlatformDesktop.getInstance()
+                configContent = DBWorkbench.getPlatform()
                     .getPluginConfigurationController(DashboardConstants.DASHBOARDS_LEGACY_PLUGIN_ID)
                     .loadConfigurationFile(CONFIG_FILE_NAME);
                 if (CommonUtils.isEmpty(configContent)) {
-                    configContent = DBPPlatformDesktop.getInstance()
+                    configContent = DBWorkbench.getPlatform()
                         .getPluginConfigurationController(DashboardConstants.DASHBOARDS_LEGACY_PLUGIN_ID2)
                         .loadConfigurationFile(CONFIG_FILE_NAME);
                 }
diff --git a/plugins/org.jkiss.dbeaver.model.rcp/src/org/jkiss/dbeaver/model/app/DBPPlatformDesktop.java b/plugins/org.jkiss.dbeaver.model.rcp/src/org/jkiss/dbeaver/model/app/DBPPlatformDesktop.java
@@ -18,7 +18,6 @@
 package org.jkiss.dbeaver.model.app;
 
 import org.jkiss.code.NotNull;
-import org.jkiss.dbeaver.model.DBConfigurationController;
 import org.jkiss.dbeaver.model.DBPExternalFileManager;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 
@@ -33,13 +32,6 @@ public interface DBPPlatformDesktop extends DBPPlatform, DBPPlatformEventManager
     @NotNull
     DBPExternalFileManager getExternalFileManager();
 
-    /**
-     * Returns configuration controller,
-     * which keeps plugin configuration which can be shared with other users.
-     */
-    @NotNull
-    DBConfigurationController getPluginConfigurationController(@NotNull String pluginId);
-
     static DBPPlatformDesktop getInstance() {
         return DBWorkbench.getPlatform(DBPPlatformDesktop.class);
     }
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/app/DBPApplicationConfigurator.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/app/DBPApplicationConfigurator.java
@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 package org.jkiss.dbeaver.model.app;
 
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.DBConfigurationController;
 import org.jkiss.dbeaver.model.DBFileController;
 import org.jkiss.dbeaver.model.task.DBTTaskController;
@@ -32,7 +33,7 @@ public interface DBPApplicationConfigurator {
      * Keeps configuration which can be shared with other users.
      */
     @NotNull
-    DBConfigurationController createConfigurationController(@NotNull String pluginId);
+    DBConfigurationController createConfigurationController(@Nullable String pluginId);
 
     @NotNull
     DBFileController createFileController();
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/app/DBPPlatform.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/app/DBPPlatform.java
@@ -18,6 +18,7 @@
 package org.jkiss.dbeaver.model.app;
 
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.DBConfigurationController;
 import org.jkiss.dbeaver.model.DBFileController;
 import org.jkiss.dbeaver.model.connection.DBPDataSourceProviderRegistry;
@@ -93,6 +94,20 @@ public interface DBPPlatform {
      */
     @NotNull
     DBConfigurationController getConfigurationController();
+    
+    /**
+     * Returns configuration controller,
+     * which keeps product configuration which can be shared with other users.
+     */
+    @NotNull
+    DBConfigurationController getProductConfigurationController();
+    
+    /**
+     * Returns configuration controller,
+     * which keeps plugin configuration which can be shared with other users.
+     */
+    @NotNull
+    DBConfigurationController getPluginConfigurationController(@Nullable String pluginId);
 
     /**
      * Local config files are used to store some configuration specific to local machine only.
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/registry/formatter/DataFormatterRegistry.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/registry/formatter/DataFormatterRegistry.java
@@ -140,7 +140,7 @@ private synchronized List<DBDDataFormatterProfile> getCustomProfilesInternal() {
     private synchronized void loadProfiles() {
         customProfiles = new ArrayList<>();
         try {
-            String content = DBWorkbench.getPlatform().getConfigurationController().loadConfigurationFile(CONFIG_FILE_NAME);
+            String content = DBWorkbench.getPlatform().getProductConfigurationController().loadConfigurationFile(CONFIG_FILE_NAME);
             if (CommonUtils.isEmpty(content)) {
                 return;
             }
@@ -189,7 +189,7 @@ private synchronized void saveProfiles() {
             xml.flush();
 
             out.flush();
-            DBWorkbench.getPlatform().getConfigurationController()
+            DBWorkbench.getPlatform().getProductConfigurationController()
                 .saveConfigurationFile(CONFIG_FILE_NAME, out.getBuffer().toString());
         } catch (Throwable ex) {
             log.warn("Failed to save data formatter profiles to " + CONFIG_FILE_NAME, ex);
diff --git a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/BasePlatformImpl.java b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/BasePlatformImpl.java
@@ -19,6 +19,7 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.ModelPreferences;
@@ -199,51 +200,47 @@ public DBWHandlerRegistry getNetworkHandlerRegistry() {
 
     @NotNull
     @Override
-    public synchronized DBConfigurationController getConfigurationController() {
-        if (defaultConfigurationController == null) {
-            Plugin productPlugin = getProductPlugin();
-            if (productPlugin == null) {
-                throw new IllegalStateException("Product plugin not found");
-            }
-            if (getApplication() instanceof DBPApplicationConfigurator appConfigurator) {
-                defaultConfigurationController = appConfigurator.createConfigurationController(productPlugin.getBundle().getSymbolicName());
-            } else {
-                LocalConfigurationController controller = new LocalConfigurationController(getLocalWorkspaceConfigFolder());
-                Path pluginStateLocation = RuntimeUtils.getPluginStateLocation(productPlugin);
-                if (Files.exists(pluginStateLocation)) {
-                    controller.setLegacyConfigFolder(pluginStateLocation);
-                }
-                defaultConfigurationController = controller;
-            }
-        }
-        return defaultConfigurationController;
+    public DBConfigurationController getConfigurationController() {
+        return getPluginConfigurationController(null);
     }
-
-    protected DBConfigurationController getConfigurationController(@NotNull Bundle bundle) {
-        DBConfigurationController controller = configurationControllerByPlugin.get(bundle);
+    
+    @NotNull
+    @Override
+    public DBConfigurationController getProductConfigurationController() {
+        return getConfigurationController(getProductPlugin().getBundle());
+    }
+    
+    @NotNull
+    @Override
+    public DBConfigurationController getPluginConfigurationController(@Nullable String pluginId) {
+        return getConfigurationController(CommonUtils.isEmpty(pluginId) ? null : Platform.getBundle(pluginId));
+    }
+    
+    private DBConfigurationController getConfigurationController(@Nullable Bundle bundle) {
+        DBConfigurationController controller = bundle == null ? defaultConfigurationController : configurationControllerByPlugin.get(bundle);
         if (controller == null) {
-            controller = createConfigurationControllerForBundle(bundle);
-            configurationControllerByPlugin.put(bundle, controller);
+            controller = createConfigurationController(bundle);
+            if (bundle == null) {
+                defaultConfigurationController = controller;
+            } else {
+                configurationControllerByPlugin.put(bundle, controller);
+            }
         }
         return controller;
     }
 
     @NotNull
     @Override
-    public DBConfigurationController createConfigurationController(@NotNull String pluginId) {
-        Bundle bundle = Platform.getBundle(pluginId);
-        if (bundle == null) {
-            throw new IllegalStateException("Bundle '" + pluginId + "' not found");
-        }
-        return createConfigurationControllerForBundle(bundle);
+    public DBConfigurationController createConfigurationController(@Nullable String pluginId) {
+        return createConfigurationController(pluginId == null ? null : Platform.getBundle(pluginId));
     }
 
     @NotNull
-    protected DBConfigurationController createConfigurationControllerForBundle(@NotNull Bundle bundle) {
+    private DBConfigurationController createConfigurationController(@Nullable Bundle bundle) {
         DBPApplication application = getApplication();
-        if (application instanceof DBPApplicationConfigurator appConfigurator) {
+        if (application instanceof DBPApplicationConfigurator) {
             String pluginBundleName = bundle == null ? null : bundle.getSymbolicName();
-            return appConfigurator.createConfigurationController(pluginBundleName);
+            return ((DBPApplicationConfigurator) application).createConfigurationController(pluginBundleName);
         } else if (bundle == null) {
             LocalConfigurationController controller = new LocalConfigurationController(
                 getLocalWorkspaceConfigFolder()
diff --git a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/LocalConfigurationController.java b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/LocalConfigurationController.java
@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,11 +34,11 @@ public class LocalConfigurationController implements DBConfigurationController {
     protected final Path configFolder;
     private Path legacyConfigFolder;
 
-    public LocalConfigurationController(@NotNull Path configFolder) {
+    public LocalConfigurationController(Path configFolder) {
         this.configFolder = configFolder;
     }
 
-    public void setLegacyConfigFolder(@NotNull Path legacyConfigFolder) {
+    public void setLegacyConfigFolder(Path legacyConfigFolder) {
         this.legacyConfigFolder = legacyConfigFolder;
     }
 
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/templates/SQLTemplateStore.java b/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/templates/SQLTemplateStore.java
@@ -1,19 +1,14 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
+/*******************************************************************************
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  *
- * Licensed 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.
- */
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     Stephan Wahlbrink <stephan.wahlbrink@walware.de> - [templates] improve logging when reading templates into SQLTemplateStore - https://bugs.eclipse.org/bugs/show_bug.cgi?id=212252
+ *******************************************************************************/
 package org.jkiss.dbeaver.ui.editors.sql.templates;
 
 import org.eclipse.core.runtime.FileLocator;
@@ -28,14 +23,14 @@
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.connection.DBPDataSourceProviderDescriptor;
+import org.jkiss.utils.ReaderWriterLock;
 import org.jkiss.dbeaver.model.impl.preferences.SimplePreferenceStore;
 import org.jkiss.dbeaver.model.rm.RMConstants;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.ui.editors.sql.internal.SQLEditorActivator;
 import org.jkiss.dbeaver.ui.preferences.PreferenceStoreDelegate;
 import org.jkiss.dbeaver.utils.ContentUtils;
 import org.jkiss.utils.CommonUtils;
-import org.jkiss.utils.ReaderWriterLock;
 import org.osgi.framework.Bundle;
 
 import java.io.*;
@@ -237,7 +232,7 @@ private CustomTemplatesStore() {
         
         public void loadTemplatesConfig() {
             try {
-                String content = DBWorkbench.getPlatform().getConfigurationController().loadConfigurationFile(TEMPLATES_CONFIG_XML);
+                String content = DBWorkbench.getPlatform().getProductConfigurationController().loadConfigurationFile(TEMPLATES_CONFIG_XML);
                 clear();
                 if (CommonUtils.isNotEmpty(content)) {
                     setValue(PREF_STORE_KEY, content);
@@ -257,7 +252,7 @@ public void save() throws IOException {
             String templatesConfig = getString(PREF_STORE_KEY);
             try {
                 DBWorkbench.getPlatform()
-                    .getConfigurationController()
+                    .getProductConfigurationController()
                     .saveConfigurationFile(TEMPLATES_CONFIG_XML, templatesConfig);
             } catch (DBException e) {
                 log.warn("Can't save template configuration", e);
