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

CB-2186 send resource path in events

Browse Source
This commit is contained in:
Ainur
2022-10-25 19:08:04 +02:00
parent 3f51fd29bc
commit 706b60132e
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/DBNAbstractResourceManagerNode.java
+1 -1
View File
@@ -40,7 +40,7 @@ public abstract class DBNAbstractResourceManagerNode extends DBNNode implements
var node = RMNavigatorUtils.findResourceNode(children, expectedResource);
if (node == null) { // we are in expected parent node
DBNResourceManagerResource newResourceNode = new DBNResourceManagerResource(this, expectedResource);
ArrayUtils.add(DBNResourceManagerResource.class, children, newResourceNode);
children = ArrayUtils.add(DBNResourceManagerResource.class, children, newResourceNode);
return;
}
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/events/CBRmResourceUpdatedEventHandlerImpl.java
+11 -10
View File
@@ -16,6 +16,8 @@
*/
package io.cloudbeaver.server.events;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import io.cloudbeaver.VirtualProjectImpl;
import io.cloudbeaver.events.CBEvent;
import io.cloudbeaver.events.CBEventConstants;
@@ -33,6 +35,9 @@ import java.util.List;
* Notify all active user session that rm resource has been updated
*/
public class CBRmResourceUpdatedEventHandlerImpl extends CBProjectUpdatedEventHandler {
private static final Gson gson = new GsonBuilder().create();
@NotNull
@Override
public String getSupportedEventType() {
@@ -41,9 +46,11 @@ public class CBRmResourceUpdatedEventHandlerImpl extends CBProjectUpdatedEventHa
@Override
protected void updateSessionData(WebSession activeUserSession, CBEvent event) {
String projectId = JSONUtils.getString(event.getEventData(), "project");
String projectId = JSONUtils.getString(event.getEventData(), "projectId");
String eventType = JSONUtils.getString(event.getEventData(), "eventType");
String resourcePath = JSONUtils.getString(event.getEventData(), "resourcePath");
RMResource[] resourceParsedPath = gson.fromJson(
gson.toJson(JSONUtils.getObjectList(event.getEventData(), "resourceParsedPath")), RMResource[].class);
if (projectId == null || eventType == null || resourcePath == null) {
return;
}
@@ -51,20 +58,14 @@ public class CBRmResourceUpdatedEventHandlerImpl extends CBProjectUpdatedEventHa
if (project == null) {
return;
}
RMController rmController = activeUserSession.getRmController();
List<RMResource> rmResourcePath;
try {
rmResourcePath = Arrays.asList(rmController.getResourcePath(projectId, resourcePath));
} catch (DBException e) {
return;
}
if (eventType.equals("create")) {
List<RMResource> rmResourcePath = Arrays.asList(resourceParsedPath);
if (eventType.equals("TYPE_CREATE")) {
RMEventManager.fireEvent(
new RMEvent(RMEvent.Action.RESOURCE_ADD,
project.getRmProject(),
rmResourcePath)
);
} else if (eventType.equals("delete")) {
} else if (eventType.equals("TYPE_DELETE")) {
RMEventManager.fireEvent(
new RMEvent(RMEvent.Action.RESOURCE_DELETE,
project.getRmProject(),