From b5858637d64e0eff075b75296757a178a98c8a0f Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Wed, 1 Jul 2026 09:48:04 +0200 Subject: [PATCH] dbeaver/pro#9222 Annotations and permissions --- .../service/DBWServiceBindingServlet.java | 4 ++-- .../service/sql/WebServiceBindingSQL.java | 2 +- .../service/admin/WebServiceBindingAdmin.java | 5 +++-- .../data/transfer/DBWServiceDataTransfer.java | 4 ++-- .../transfer/WebServiceBindingDataTransfer.java | 13 +++++++------ .../cloudbeaver/service/fs/WebServiceBindingFS.java | 5 +++-- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/service/DBWServiceBindingServlet.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/service/DBWServiceBindingServlet.java index 580316e7bf..889eb2ce80 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/service/DBWServiceBindingServlet.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/service/DBWServiceBindingServlet.java @@ -1,6 +1,6 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2025 DBeaver Corp and others + * Copyright (C) 2010-2026 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. @@ -30,7 +30,7 @@ public interface DBWServiceBindingServlet getExcludedServletPaths(@NotNull APPLICATION application) { diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java index 0ee59bb78d..bfb8978ed4 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java @@ -350,7 +350,7 @@ public class WebServiceBindingSQL extends WebServiceBindingBase } @Override - public void addServlets(ServletApplication application, DBWServletContext servletContext) throws DBException { + public void addServlets(@NotNull ServletApplication application, @NotNull DBWServletContext servletContext) throws DBException { servletContext.addServlet( "sqlResultValueViewer", new WebSQLResultServlet(application, getServiceImpl()), diff --git a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/WebServiceBindingAdmin.java b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/WebServiceBindingAdmin.java index b849bc409e..6a80d18fb2 100644 --- a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/WebServiceBindingAdmin.java +++ b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/WebServiceBindingAdmin.java @@ -1,6 +1,6 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2025 DBeaver Corp and others + * Copyright (C) 2010-2026 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. @@ -25,6 +25,7 @@ import io.cloudbeaver.service.DBWServletContext; import io.cloudbeaver.service.WebServiceBindingBase; import io.cloudbeaver.service.admin.impl.WebAdminLogsServlet; import io.cloudbeaver.service.admin.impl.WebServiceAdmin; +import org.jkiss.code.NotNull; import org.jkiss.dbeaver.DBException; import org.jkiss.utils.CommonUtils; @@ -205,7 +206,7 @@ public class WebServiceBindingAdmin extends WebServiceBindingBase implements DBWServiceBindingServlet { +public class WebServiceBindingDataTransfer extends WebServiceBindingBase implements DBWServiceBindingServlet> { public WebServiceBindingDataTransfer() { super(DBWServiceDataTransfer.class, new WebServiceDataTransfer(), "schema/service.data.transfer.graphqls"); @@ -47,17 +48,17 @@ public class WebServiceBindingDataTransfer extends WebServiceBindingBase getService(env).getAvailableImportStreamProcessors(getWebSession(env))) .dataFetcher("dataTransferExportDataFromContainer", env -> getService(env).dataTransferExportDataFromContainer( WebServiceBindingSQL.getSQLProcessor(env), - getArgument(env, "containerNodePath"), + getArgumentVal(env, "containerNodePath"), new WebDataTransferParameters(getArgument(env, "parameters")) )) .dataFetcher("dataTransferExportDataFromResults", env -> getService(env).dataTransferExportDataFromResults( WebServiceBindingSQL.getSQLContext(env), - getArgument(env, "resultsId"), + getArgumentVal(env, "resultsId"), new WebDataTransferParameters(getArgument(env, "parameters")) )) .dataFetcher("dataTransferRemoveDataFile", env -> getService(env).dataTransferRemoveDataFile( getWebSession(env), - getArgument(env, "dataFileId") + getArgumentVal(env, "dataFileId") )) .dataFetcher("dataTransferDefaultExportSettings", env -> getService(env).defaultExportSettings()) ; @@ -65,7 +66,7 @@ public class WebServiceBindingDataTransfer extends WebServiceBindingBase application, @NotNull DBWServletContext servletContext) throws DBException { if (!application.isMultiuser()) { return; } diff --git a/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/WebServiceBindingFS.java b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/WebServiceBindingFS.java index 9d16ca06ac..12f836cf26 100644 --- a/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/WebServiceBindingFS.java +++ b/server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/WebServiceBindingFS.java @@ -1,6 +1,6 @@ /* * DBeaver - Universal Database Manager - * Copyright (C) 2010-2024 DBeaver Corp and others + * Copyright (C) 2010-2026 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. @@ -24,6 +24,7 @@ import io.cloudbeaver.service.DBWServletContext; import io.cloudbeaver.service.WebServiceBindingBase; import io.cloudbeaver.service.fs.impl.WebServiceFS; import io.cloudbeaver.service.fs.model.WebFSServlet; +import org.jkiss.code.NotNull; import org.jkiss.dbeaver.DBException; import org.jkiss.utils.CommonUtils; @@ -117,7 +118,7 @@ public class WebServiceBindingFS extends WebServiceBindingBase imp } @Override - public void addServlets(CBApplication application, DBWServletContext servletContext) throws DBException { + public void addServlets(@NotNull CBApplication application, @NotNull DBWServletContext servletContext) throws DBException { if (!application.isMultiuser()) { return; }