This is an automated email from the ASF dual-hosted git repository. tenthe pushed a commit to branch chore/remove-useraccount-preferred-fields in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 768b00f496d3b574e5be44c2c89d62504e1ac5b2 Author: Philipp Zehnder <[email protected]> AuthorDate: Fri Nov 6 08:31:37 2026 +0100 refactor: remove unused preferred fields from user --- .../streampipes/model/streampipes_user/user.go | 33 ++++++------- .../streampipes/model/client/user/UserAccount.java | 55 ---------------------- .../src/lib/model/gen/streampipes-model-client.ts | 12 ----- 3 files changed, 15 insertions(+), 85 deletions(-) diff --git a/streampipes-client-go/streampipes/model/streampipes_user/user.go b/streampipes-client-go/streampipes/model/streampipes_user/user.go index d3d87f69b1..8a7688ab2c 100644 --- a/streampipes-client-go/streampipes/model/streampipes_user/user.go +++ b/streampipes-client-go/streampipes/model/streampipes_user/user.go @@ -24,24 +24,21 @@ type ShortUserInfo struct { } type UserAccount struct { - PrincipalID string `json:"principalId"` - Rev string `json:"rev"` - Username string `json:"username"` - ObjectPermissions []string `json:"objectPermissions"` - Roles []string `json:"roles"` - Groups []string `json:"groups"` - AccountEnabled bool `json:"accountEnabled"` - AccountLocked bool `json:"accountLocked"` - AccountExpired bool `json:"accountExpired"` - PrincipalType string `json:"principalType"` - FullName string `json:"fullName"` - Password string `json:"password"` - PreferredDataStreams []string `json:"preferredDataStreams"` - PreferredDataProcessors []string `json:"preferredDataProcessors"` - PreferredDataSinks []string `json:"preferredDataSinks"` - UserApiTokens []UserApiToken `json:"userApiTokens"` - HideTutorial bool `json:"hideTutorial"` - DarkMode bool `json:"darkMode"` + PrincipalID string `json:"principalId"` + Rev string `json:"rev"` + Username string `json:"username"` + ObjectPermissions []string `json:"objectPermissions"` + Roles []string `json:"roles"` + Groups []string `json:"groups"` + AccountEnabled bool `json:"accountEnabled"` + AccountLocked bool `json:"accountLocked"` + AccountExpired bool `json:"accountExpired"` + PrincipalType string `json:"principalType"` + FullName string `json:"fullName"` + Password string `json:"password"` + UserApiTokens []UserApiToken `json:"userApiTokens"` + HideTutorial bool `json:"hideTutorial"` + DarkMode bool `json:"darkMode"` } type UserApiToken struct { diff --git a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/UserAccount.java b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/UserAccount.java index 2fb2379588..3262934624 100644 --- a/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/UserAccount.java +++ b/streampipes-model-client/src/main/java/org/apache/streampipes/model/client/user/UserAccount.java @@ -32,10 +32,6 @@ public class UserAccount extends Principal { protected String fullName; protected String password; - protected List<String> preferredDataStreams; - protected List<String> preferredDataProcessors; - protected List<String> preferredDataSinks; - protected List<UserApiToken> userApiTokens; protected boolean hideTutorial; @@ -56,9 +52,6 @@ public class UserAccount extends Principal { super(PrincipalType.USER_ACCOUNT); this.hideTutorial = false; this.userApiTokens = new ArrayList<>(); - this.preferredDataProcessors = new ArrayList<>(); - this.preferredDataSinks = new ArrayList<>(); - this.preferredDataStreams = new ArrayList<>(); this.createdAtMillis = System.currentTimeMillis(); this.provider = UserAccount.LOCAL; } @@ -84,54 +77,6 @@ public class UserAccount extends Principal { this.roles = roles; } - public List<String> getPreferredDataStreams() { - return preferredDataStreams; - } - - public void setPreferredDataStreams(List<String> preferredDataStreams) { - this.preferredDataStreams = preferredDataStreams; - } - - public List<String> getPreferredDataProcessors() { - return preferredDataProcessors; - } - - public void setPreferredDataProcessors(List<String> preferredDataProcessors) { - this.preferredDataProcessors = preferredDataProcessors; - } - - public List<String> getPreferredDataSinks() { - return preferredDataSinks; - } - - public void setPreferredDataSinks(List<String> preferredDataSinks) { - this.preferredDataSinks = preferredDataSinks; - } - - public void addPreferredDataStream(String elementId) { - this.preferredDataStreams.add(elementId); - } - - public void addPreferredDataProcessor(String elementId) { - this.preferredDataProcessors.add(elementId); - } - - public void addPreferredDataSink(String elementId) { - this.preferredDataSinks.add(elementId); - } - - public void removePreferredDataStream(String elementId) { - this.preferredDataStreams.remove(elementId); - } - - public void removePreferredDataProcessor(String elementId) { - this.preferredDataProcessors.remove(elementId); - } - - public void removePreferredDataSink(String elementId) { - this.preferredDataSinks.remove(elementId); - } - public String getFullName() { return fullName; } diff --git a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts index d139164460..5685f3b684 100644 --- a/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts +++ b/ui/projects/streampipes/platform-services/src/lib/model/gen/streampipes-model-client.ts @@ -247,9 +247,6 @@ export class UserAccount extends Principal { language: string; lastLoginAtMillis: number; password: string; - preferredDataProcessors: string[]; - preferredDataSinks: string[]; - preferredDataStreams: string[]; provider: string; userApiTokens: UserApiToken[]; @@ -268,15 +265,6 @@ export class UserAccount extends Principal { instance.language = data.language; instance.lastLoginAtMillis = data.lastLoginAtMillis; instance.password = data.password; - instance.preferredDataProcessors = __getCopyArrayFn( - __identity<string>(), - )(data.preferredDataProcessors); - instance.preferredDataSinks = __getCopyArrayFn(__identity<string>())( - data.preferredDataSinks, - ); - instance.preferredDataStreams = __getCopyArrayFn(__identity<string>())( - data.preferredDataStreams, - ); instance.provider = data.provider; instance.userApiTokens = __getCopyArrayFn(UserApiToken.fromData)( data.userApiTokens,
