Merge remote-tracking branch 'origin/devel' into CB-2386-cb-aws-the-changed-admin-in-the-easy-config-lost-the-admin-role-after-another-user-login

Author: alexander-skoblikov

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/VirtualProjectImpl.java

@@ -56,7 +56,7 @@ public boolean isVirtual() {
     @NotNull
     @Override
     public String getName() {
-        return project.getName();
+        return project.getDisplayName();
     }
 
     @NotNull

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java

@@ -438,7 +438,8 @@ public byte[] getResourceContents(@NotNull String projectId, @NotNull String res
     public String setResourceContents(
         @NotNull String projectId,
         @NotNull String resourcePath,
-        @NotNull byte[] data) throws DBException
+        @NotNull byte[] data,
+        boolean forceOverwrite) throws DBException
     {
         validateResourcePath(resourcePath);
         Number fileSizeLimit = WebAppUtils.getWebApplication()
@@ -452,6 +453,9 @@ public String setResourceContents(
                     data.length);
         }
         Path targetPath = getTargetPath(projectId, resourcePath);
+        if (!forceOverwrite && Files.exists(targetPath)) {
+            throw new DBException("Resource '" + resourcePath + "' exists");
+        }
         if (!Files.exists(targetPath.getParent())) {
             throw new DBException("Parent folder '" + targetPath.getParent().getFileName() + "' doesn't exist");
         }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSession.java

@@ -493,8 +493,8 @@ public String getLocale() {
         return locale;
     }
 
-    public void setLocale(String locale) {
-        this.locale = locale;
+    public void setLocale(@Nullable String locale) {
+        this.locale = locale != null ? locale : Locale.getDefault().getLanguage();
     }
 
     public DBNModel getNavigatorModel() {

server/bundles/io.cloudbeaver.server/plugin.xml

@@ -22,7 +22,7 @@
 
     <extension point="io.cloudbeaver.service">
         <service id="core" label="Core service" description="Core services" class="io.cloudbeaver.service.core.WebServiceBindingCore">
-            <permission id="public" label="Public access" category="general" scope="subject"/>
+            <permission id="public" label="Public access" category="general" scope="subject" description="Provides access to the data management interface"/>
             <permission id="access" label="Data source access" category="general" scope="datasource"/>
         </service>
         <service id="navigator" label="Database navigator" description="Database navigator services" class="io.cloudbeaver.service.navigator.WebServiceBindingNavigator">

server/bundles/io.cloudbeaver.service.admin/plugin.xml

@@ -5,7 +5,7 @@
 
     <extension point="io.cloudbeaver.service">
         <service id="admin" label="User administration" description="User administration services" class="io.cloudbeaver.service.admin.WebServiceBindingAdmin">
-            <permission id="admin" label="Admin Full Access" category="admin" scope="subject"/>
+            <permission id="admin" label="Admin Full Access" category="admin" scope="subject" description="Provides access to the CloudBeaver configuration"/>
         </service>
     </extension>
 

server/bundles/io.cloudbeaver.service.rm/schema/service.rm.graphqls

@@ -57,7 +57,8 @@ extend type Mutation {
     rmWriteResourceStringContent(
         projectId: String!,
         resourcePath: String!,
-        data: String!): String!
+        data: String!,
+        forceOverwrite: Boolean!): String!
 
     rmCreateProject(
         projectName: String!,

server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/DBWServiceRM.java

@@ -80,7 +80,8 @@ String writeResourceStringContent(
         @NotNull WebSession webSession,
         @NotNull @WebObjectId String projectId,
         @NotNull String resourcePath,
-        @NotNull String data) throws DBException;
+        @NotNull String data,
+        boolean forceOverwrite) throws DBException;
 
     @WebAction(requirePermissions = {DBWConstants.PERMISSION_ADMIN, RMConstants.PERMISSION_RM_ADMIN})
     WebProjectInfo createProject(

server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/WebServiceBindingRM.java

@@ -64,7 +64,8 @@ public void bindWiring(DBWBindingContext model) throws DBWebException {
                 env -> getService(env).writeResourceStringContent(getWebSession(env),
                     env.getArgument("projectId"),
                     env.getArgument("resourcePath"),
-                    env.getArgument("data")))
+                    env.getArgument("data"),
+                    env.getArgument("forceOverwrite")))
 
             .dataFetcher("rmCreateProject", env -> getService(env).createProject(
                 getWebSession(env),

server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/impl/WebServiceRM.java

@@ -89,11 +89,17 @@ public boolean deleteResource(@NotNull WebSession webSession, @NotNull String pr
 
     @NotNull
     @Override
-    public String writeResourceStringContent(@NotNull WebSession webSession, @NotNull String projectId, @NotNull String resourcePath, @NotNull String data) throws DBException {
+    public String writeResourceStringContent(
+        @NotNull WebSession webSession,
+        @NotNull String projectId,
+        @NotNull String resourcePath,
+        @NotNull String data,
+        boolean forceOverwrite
+    ) throws DBException {
         checkIsRmEnabled(webSession);
         try {
             byte[] bytes = data.getBytes(StandardCharsets.UTF_8);
-            return getResourceController(webSession).setResourceContents(projectId, resourcePath, bytes);
+            return getResourceController(webSession).setResourceContents(projectId, resourcePath, bytes, forceOverwrite);
         } catch (Exception e) {
             throw new DBWebException("Error writing resource '" + resourcePath + "' data", e);
         }

server/test/io.cloudbeaver.test.platform/META-INF/MANIFEST.MF

@@ -22,5 +22,6 @@ Require-Bundle: org.eclipse.core.runtime,
  io.cloudbeaver.server,
  io.cloudbeaver.resources.drivers.base,
  io.cloudbeaver.product.ce,
- io.cloudbeaver.service.auth
+ io.cloudbeaver.service.auth,
+ io.cloudbeaver.service.rm
 Export-Package: io.cloudbeaver.test.platform