dbeaver-vscode#3 cleanup servlets

dbeaver · Sep 3, 2024 · 2141d08 · 2141d08
1 parent dc2866c
commit 2141d08
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/...er/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java b/...er/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java
@@ -296,6 +296,9 @@ public static WebSQLContextInfo getSQLContext(WebSQLProcessor processor, String
 
     @Override
     public void addServlets(WebApplication application, DBWServletContext servletContext) throws DBException {
+        if (!application.isMultiuser()) {
+            return;
+        }
         servletContext.addServlet(
             "sqlResultValueViewer",
             new WebSQLResultServlet(application, getServiceImpl()),

diff --git a/...io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/WebServiceBindingAdmin.java b/...io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/WebServiceBindingAdmin.java
@@ -202,6 +202,9 @@ public void bindWiring(DBWBindingContext model) throws DBWebException {
 
     @Override
     public void addServlets(CBApplication application, DBWServletContext servletContext) throws DBException {
+        if(!application.isMultiuser()) {
+            return;
+        }
         servletContext.addServlet("adminLogs", new WebAdminLogsServlet(application), application.getServicesURI() + "logs/*");
     }
 

diff --git a/...data.transfer/src/io/cloudbeaver/service/data/transfer/WebServiceBindingDataTransfer.java b/...data.transfer/src/io/cloudbeaver/service/data/transfer/WebServiceBindingDataTransfer.java
@@ -66,6 +66,9 @@ public void bindWiring(DBWBindingContext model) {
 
     @Override
     public void addServlets(CBApplication application, DBWServletContext servletContext) throws DBException {
+        if (!application.isMultiuser()) {
+            return;
+        }
         servletContext.addServlet(
             "dataTransfer",
             new WebDataTransferServlet(application, getServiceImpl()),

diff --git a/.../bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/WebServiceBindingFS.java b/.../bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/WebServiceBindingFS.java
@@ -118,6 +118,9 @@ public void bindWiring(DBWBindingContext model) throws DBWebException {
 
     @Override
     public void addServlets(CBApplication application, DBWServletContext servletContext) throws DBException {
+        if (!application.isMultiuser()) {
+            return;
+        }
         servletContext.addServlet(
             "fileSystems",
             new WebFSServlet(application, getServiceImpl()),