From 82750e3ed55e1d0e7ccc1f1805bdb24e9bb94cbc Mon Sep 17 00:00:00 2001 From: Sergei Kovalchuk Date: Thu, 29 Feb 2024 11:31:39 +0100 Subject: [PATCH 1/4] dbeaver/pro#2552 [TE] deleted profiles appear again after app launch Api fixed for store entire list of profiles --- .../src/io/cloudbeaver/WebDataSourceRegistryProxy.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java index eb5b6c37f2..c1bf73df5e 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java @@ -39,6 +39,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; +import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -251,6 +252,11 @@ public void updateAuthProfile(DBAAuthProfile profile) { dataSourceRegistry.updateAuthProfile(profile); } + @Override + public void addAuthProfiles(Collection profiles) { + dataSourceRegistry.addAuthProfiles(profiles); + } + @Override public void removeAuthProfile(DBAAuthProfile profile) { dataSourceRegistry.removeAuthProfile(profile); From b4ccae2a0ad25112c0dfba6461bc748edf2db491 Mon Sep 17 00:00:00 2001 From: Sergei Kovalchuk Date: Thu, 29 Feb 2024 11:33:40 +0100 Subject: [PATCH 2/4] dbeaver/pro#2552 [TE] deleted profiles appear again after app launch Remove un used import --- .../src/io/cloudbeaver/WebDataSourceRegistryProxy.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java index c1bf73df5e..60b5b47e5c 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java @@ -39,7 +39,6 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; From 5889c753e6ad692bd9546ecb3462001e4363d130 Mon Sep 17 00:00:00 2001 From: Sergei Kovalchuk Date: Thu, 29 Feb 2024 11:50:38 +0100 Subject: [PATCH 3/4] dbeaver/pro#2552 [TE] deleted profiles appear again after app launch Fixed api --- .../src/io/cloudbeaver/WebDataSourceRegistryProxy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java index 60b5b47e5c..7263ca113d 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java @@ -252,8 +252,8 @@ public void updateAuthProfile(DBAAuthProfile profile) { } @Override - public void addAuthProfiles(Collection profiles) { - dataSourceRegistry.addAuthProfiles(profiles); + public void setAuthProfiles(Collection profiles) { + dataSourceRegistry.setAuthProfiles(profiles); } @Override From 89b831bb9e5a407b564330f1c34ba9af700289fe Mon Sep 17 00:00:00 2001 From: Sergei Kovalchuk Date: Wed, 6 Mar 2024 14:23:29 +0100 Subject: [PATCH 4/4] dbeaver/pro#2552 [TE] deleted profiles appear again after app launch --- .../src/io/cloudbeaver/WebDataSourceRegistryProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java index 7263ca113d..a55c351eba 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.java @@ -252,7 +252,7 @@ public void updateAuthProfile(DBAAuthProfile profile) { } @Override - public void setAuthProfiles(Collection profiles) { + public void setAuthProfiles(@NotNull Collection profiles) { dataSourceRegistry.setAuthProfiles(profiles); }