dbeaver/pro#3345 vfs refactoring (#2928)

* dbeaver/pro#3345 Navigator model refactoring * dbeaver/pro#3345 Navigator model refactoring * dbeaver/pro#3345 Get rid of org.eclipse.core.resources * dbeaver/pro#3345 SQL dialect model refactoring --------- Co-authored-by: kseniaguzeeva <[email protected]>
dbeaver · Sep 24, 2024 · 4b9e1c8 · 4b9e1c8
1 parent dc5592d
commit 4b9e1c8
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 19 deletions.
diff --git a/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
 Require-Bundle: org.jkiss.dbeaver.data.gis;visibility:=reexport,
  org.jkiss.dbeaver.model;visibility:=reexport,
- org.jkiss.dbeaver.model.rcp;visibility:=reexport,
  org.jkiss.dbeaver.model.sm;visibility:=reexport,
  org.jkiss.dbeaver.model.event;visibility:=reexport,
  org.jkiss.dbeaver.model.nio;visibility:=reexport,

diff --git a/...r/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java b/...r/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerProject.java
@@ -121,9 +121,9 @@ public DBNNode refreshNode(DBRProgressMonitor monitor, Object source) throws DBE
         return this;
     }
 
-    @NotNull
+    @Nullable
     @Override
-    public DBPProject getOwnerProject() {
+    public DBPProject getOwnerProjectOrNull() {
         List<? extends DBPProject> globalProjects = getModel().getModelProjects();
         if (globalProjects != null) {
             for (DBPProject modelProject : globalProjects) {
@@ -132,7 +132,7 @@ public DBPProject getOwnerProject() {
                 }
             }
         }
-        throw new IllegalStateException("Project '" + project.getId() + "' not found in workspace");
+        return null;
     }
 
     @Nullable

diff --git a/.../bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java b/.../bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNResourceManagerResource.java
@@ -203,10 +203,10 @@ public DBPObject getObjectDetails(@NotNull DBRProgressMonitor monitor, @NotNull
         return resource;
     }
 
-    @NotNull
+    @Nullable
     @Override
-    public DBPProject getOwnerProject() {
-        return getParentNode().getOwnerProject();
+    public DBPProject getOwnerProjectOrNull() {
+        return getParentNode().getOwnerProjectOrNull();
     }
 
     public RMResource getResource() {

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebPlatformActivator.java
@@ -16,8 +16,6 @@
  */
 package io.cloudbeaver.server;
 
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Plugin;
 import org.jkiss.dbeaver.ModelPreferences;
 import org.jkiss.dbeaver.model.impl.preferences.BundlePreferenceStore;
@@ -76,13 +74,6 @@ public DBPPreferenceStore getPreferences() {
         return preferences;
     }
 
-    /**
-     * Returns the workspace instance.
-     */
-    public static IWorkspace getWorkspace() {
-        return ResourcesPlugin.getWorkspace();
-    }
-
     protected void shutdownPlatform() {
 
     }

diff --git a/...undles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataContainer.java b/...undles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataContainer.java
@@ -26,11 +26,11 @@
 import org.jkiss.dbeaver.model.data.DBDDataFilter;
 import org.jkiss.dbeaver.model.data.DBDDataReceiver;
 import org.jkiss.dbeaver.model.exec.*;
-import org.jkiss.dbeaver.model.impl.sql.SQLQueryTransformerCount;
 import org.jkiss.dbeaver.model.sql.SQLQuery;
 import org.jkiss.dbeaver.model.sql.SQLScriptContext;
 import org.jkiss.dbeaver.model.sql.SQLSyntaxManager;
 import org.jkiss.dbeaver.model.sql.data.SQLQueryDataContainer;
+import org.jkiss.dbeaver.model.sql.transformers.SQLQueryTransformerCount;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 

diff --git a/server/features/io.cloudbeaver.server.feature/feature.xml b/server/features/io.cloudbeaver.server.feature/feature.xml
@@ -15,7 +15,6 @@
     </copyright>
 
     <requires>
-        <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.core.runtime" version="3.7" match="greaterOrEqual"/>
         <!-- Equinox -->
         <import plugin="org.eclipse.equinox.common" version="0.0.0" match="greaterOrEqual"/>

diff --git a/server/features/io.cloudbeaver.ws.feature/feature.xml b/server/features/io.cloudbeaver.ws.feature/feature.xml
@@ -15,7 +15,6 @@
     </copyright>
 
     <requires>
-        <import plugin="org.eclipse.core.resources" version="0.0.0" match="greaterOrEqual"/>
         <import plugin="org.eclipse.core.runtime" version="3.7" match="greaterOrEqual"/>
         <!-- Equinox -->
         <import plugin="org.jkiss.dbeaver.launcher" version="0.0.0" match="greaterOrEqual"/>