opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-10-24 01:23:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #674 from dbeaver/feature/CB-1669

Browse Source 
CB-1669 rollback web drivers filter
This commit is contained in:
Alexander Skoblikov
2022-02-22 12:02:45 +03:00
committed by GitHub
parent 17c4bad22f 53ee0b54a7
commit 280f426682
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/registry/WebDriverRegistry.java
+1 -6
View File
@@ -16,7 +16,6 @@
*/
package io.cloudbeaver.registry;
import io.cloudbeaver.server.ConfigurationUtils;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform;
@@ -61,11 +60,7 @@ public class WebDriverRegistry {
}
public boolean isDriverEnabled(DBPDriver driver) {
String driverId = driver.getFullId();
if (webDrivers.contains(driverId)) {
return ConfigurationUtils.isDriverEnabled(driver);
}
return false;
return webDrivers.contains(driver.getFullId());
}
}
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBPlatform.java
+4
View File
@@ -18,6 +18,7 @@
package io.cloudbeaver.server;
import io.cloudbeaver.model.session.WebSessionManager;
import io.cloudbeaver.registry.WebDriverRegistry;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Platform;
import org.jkiss.code.NotNull;
@@ -303,6 +304,9 @@ public class CBPlatform extends BasePlatformImpl {
for (DBPDriver driver : dspd.getEnabledDrivers()) {
List<? extends DBPDriverLibrary> libraries = driver.getDriverLibraries();
{
if (!WebDriverRegistry.getInstance().isDriverEnabled(driver)) {
continue;
}
boolean hasAllFiles = true;
for (DBPDriverLibrary lib : libraries) {
if (!lib.isOptional() && lib.getType() != DBPDriverLibrary.FileType.license &&