From ac937698bd7a198dfca1c4dd2af848baab52b5be Mon Sep 17 00:00:00 2001 From: ShadelessFox <35821147+ShadelessFox@users.noreply.github.com> Date: Wed, 16 Oct 2024 10:33:25 +0200 Subject: [PATCH] dbeaver/pro#3393 Add "UDBT" feature (#3000) Co-authored-by: Serge Rider Co-authored-by: kseniaguzeeva <112612526+kseniaguzeeva@users.noreply.github.com> --- .../io/cloudbeaver/model/app/BaseWebAppConfiguration.java | 4 ++++ .../src/io/cloudbeaver/model/app/WebAppConfiguration.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java index ab30ce377d..4c3a1714e1 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.java @@ -84,14 +84,18 @@ public abstract class BaseWebAppConfiguration implements WebAppConfiguration { return resourceManagerEnabled; } + @Override public boolean isFeatureEnabled(String id) { return ArrayUtils.contains(getEnabledFeatures(), id); } + @Override public boolean isFeaturesEnabled(String[] features) { return ArrayUtils.containsAll(getEnabledFeatures(), features); } + @NotNull + @Override public String[] getEnabledFeatures() { if (enabledFeatures == null) { // No config - enable all features (+backward compatibility) diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebAppConfiguration.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebAppConfiguration.java index ca09529a49..c377b924b9 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebAppConfiguration.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/WebAppConfiguration.java @@ -44,6 +44,11 @@ public interface WebAppConfiguration { boolean isFeatureEnabled(String id); + @NotNull + default String[] getEnabledFeatures() { + return new String[0]; + } + default boolean isSupportsCustomConnections() { return true; }