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

CB-2178 RM service refactoring and simplification

Browse Source
This commit is contained in:
serge-rider
2022-06-27 21:30:57 +02:00
parent ad19f0b090
commit a63e7ee257
2 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
+2 -24
View File
@@ -39,7 +39,6 @@ import java.nio.file.Path;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Collectors;
/**
@@ -56,7 +55,6 @@ public class LocalResourceController implements RMController {
private static final String PROJECT_PREFIX_USER = "u_";
public static final String DEFAULT_CHANGE_ID = "0";
private final List<RMEventListener> listeners = new CopyOnWriteArrayList<>();
private final SMCredentialsProvider credentialsProvider;
private final Path rootPath;
@@ -131,7 +129,7 @@ public class LocalResourceController implements RMController {
}
@Override
public void createProject(@NotNull RMProject project) throws DBException {
public RMProject createProject(@NotNull String id, @NotNull String name, @NotNull String description) throws DBException {
throw new DBCFeatureNotSupportedException();
}
@@ -219,7 +217,7 @@ public class LocalResourceController implements RMController {
} catch (IOException e) {
throw new DBException("Error deleting resource '" + resourcePath + "'", e);
}
fireEvent(
RMEventManager.fireEvent(
new RMEvent(RMEvent.Action.RESOURCE_DELETE,
makeProjectFromId(projectId),
rmResourcePath
@@ -288,26 +286,6 @@ public class LocalResourceController implements RMController {
}
}
@Override
public void addRMEventListener(RMEventListener listener) {
this.listeners.add(listener);
}
@Override
public void removeRMEventListener(RMEventListener listener) {
this.listeners.remove(listener);
}
private void fireEvent(RMEvent event) {
for (var listener : listeners) {
try {
listener.handleRMEvent(event);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
}
@NotNull
private Path getTargetPath(@NotNull String projectId, @NotNull String resourcePath) throws DBException {
Path projectPath = getProjectPath(projectId);
server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/DBNResourceManagerRoot.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
}
List<DBNResourceManagerProject> projectNodes = new ArrayList<>();
resourceController = ((WebSession) session).getRmController();
resourceController.addRMEventListener(this);
RMEventManager.addEventListener(this);
for (RMProject project : resourceController.listAccessibleProjects()) {
projectNodes.add(new DBNResourceManagerProject(this, project));
}