Feature/self inject storage into permission owners #2101

thoniTUB · 2021-09-21T12:16:54Z

No description provided.

make store creators static dont double cache dictionaries inject meta storage into permission owners fixes tests Fix serialization test capsule storage for group and role handling fix compile errors remove usage of userish

…ct-storage # Conflicts: # backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/BigStore.java # backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java # backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/XodusStore.java # backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java # backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java

awildturtok

Bin mir nicht sicher, ob ich verstehe was du damit erreichen möchtest. Ich denke es wäre besser an der Stelle den ganzen MetaStorage zu Injecten (übrigens nices Feature was du da entdeckt hast), statt UpdaterUpdater

backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java

backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoUser.java

backend/src/main/java/com/bakdata/conquery/io/storage/MetaStorage.java

backend/src/main/java/com/bakdata/conquery/models/auth/entities/Group.java

...c/main/java/com/bakdata/conquery/models/forms/frontendconfiguration/FormConfigProcessor.java

backend/src/main/java/com/bakdata/conquery/resources/admin/rest/AdminProcessor.java

backend/src/test/java/com/bakdata/conquery/api/form/config/FormConfigTest.java

backend/src/test/java/com/bakdata/conquery/integration/common/LoadingUtil.java

.java

backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java

backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoUser.java

backend/src/main/java/com/bakdata/conquery/models/auth/AuthorizationController.java

.../main/java/com/bakdata/conquery/models/auth/basic/UserAuthenticationManagementProcessor.java

backend/src/main/java/com/bakdata/conquery/models/auth/entities/PermissionOwner.java

backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java

backend/src/test/java/com/bakdata/conquery/util/support/TestLoggingFactory.java

…t-storage # Conflicts: # backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/BigStore.java # backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java # backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java # backend/src/test/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStoreDumpTest.java # docs/Config JSON.md

backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java

backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoUser.java

backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/SerializingStore.java

.../main/java/com/bakdata/conquery/models/auth/basic/UserAuthenticationManagementProcessor.java

backend/src/main/java/com/bakdata/conquery/models/auth/develop/DevAuthConfig.java

backend/src/main/java/com/bakdata/conquery/models/auth/entities/PermissionOwner.java

backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java

…r.java Co-authored-by: awildturtok <1553491+awildturtok@users.noreply.github.com>

…le global injection into json deserialization

awildturtok · 2021-09-24T09:12:19Z

backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoUser.java

-		return userManager.addUser(getUser(), credentials);
+
+	@JsonIgnore
+	public UserId getId() {


müsste das nicht createId sein?

backend/src/main/java/com/bakdata/conquery/commands/ManagerNode.java

backend/src/main/java/com/bakdata/conquery/io/jackson/Injectable.java

.../main/java/com/bakdata/conquery/models/auth/basic/UserAuthenticationManagementProcessor.java

backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java

awildturtok · 2021-09-27T15:23:05Z

backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java

 	private Path directory = Path.of("storage");

 	private boolean validateOnWrite = false;
 	@NotNull
 	@Valid
 	private XodusConfig xodus = new XodusConfig();

-	private boolean useWeakDictionaryCaching = false;
+	private boolean useWeakDictionaryCaching = true;


revert default

awildturtok · 2021-09-27T15:23:29Z

backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java

@@ -151,17 +183,17 @@ private void configureMapper(ConqueryConfig config) {
 	@Override
 	@SneakyThrows
 	public Collection<NamespaceStorage> loadNamespaceStorages() {
-		return loadNamespacedStores("dataset_", (elements) -> new NamespaceStorage(validator, this, elements));
+		return loadNamespacedStores("dataset_", (storesToTest) -> new NamespaceStorage(validator, this, storesToTest), NAMESPACE_STORES);


warum toTest?

Weil das die stores sind die wir erwarten, ich nenne es in expectedStores um ;)

ah nee an der Stelle ist es einfach der falsche Name :D

…e-MERGE # Conflicts: # backend/src/main/java/com/bakdata/conquery/io/storage/xodus/stores/BigStore.java # backend/src/main/java/com/bakdata/conquery/models/config/XodusStoreFactory.java # backend/src/main/java/com/bakdata/conquery/models/query/QueryTranslator.java # docs/Config JSON.md

thoniTUB added 4 commits September 21, 2021 12:49

inject storage into permission owner

c48d174

make store creators static dont double cache dictionaries inject meta storage into permission owners fixes tests Fix serialization test capsule storage for group and role handling fix compile errors remove usage of userish

use an injectable storageUpdater instead of the storage it self

8904ff9

fix serialization

c478068

thoniTUB requested a review from awildturtok September 21, 2021 12:16

github-actions bot and others added 2 commits September 21, 2021 12:19

Update AutoDoc

ec34339

pull up store updater

45f7dc3

awildturtok requested changes Sep 21, 2021

View reviewed changes

thoniTUB added 4 commits September 21, 2021 18:26

review changes

18f2752

Revert "use an injectable storageUpdater instead of the storage it self"

4c76604

.java

capsule storage for group and role handling

7c85622

fix serialization

c05d178

awildturtok self-requested a review September 22, 2021 12:25

thoniTUB added 2 commits September 22, 2021 14:46

check for all stores in a namespaces storage

ba83a47

check namespaced storages for stores

71ffe95

awildturtok requested changes Sep 22, 2021

View reviewed changes

thoniTUB and others added 2 commits September 22, 2021 16:19

Update AutoDoc

0ad7a65

thoniTUB requested a review from awildturtok September 22, 2021 14:50

thoniTUB and others added 2 commits September 22, 2021 16:50

review changes

64c0e46

Update AutoDoc

7f9e942

awildturtok requested changes Sep 22, 2021

View reviewed changes

thoniTUB and others added 4 commits September 23, 2021 09:25

Update backend/src/main/java/com/bakdata/conquery/apiv1/auth/ProtoUse…

abfeff4

…r.java Co-authored-by: awildturtok <1553491+awildturtok@users.noreply.github.com>

move auth registration method to AuthorizationHelper.java

66274e8

review changes

f4945e5

Update AutoDoc

872d47f

thoniTUB requested a review from awildturtok September 23, 2021 07:53

thoniTUB added 3 commits September 23, 2021 13:37

adds JsonIgnore to ProtoUser.java

368a133

split phase for instantiation and loading of MetaStorage.java to enab…

2f9c5bb

…le global injection into json deserialization

remove validator from MetaStorage

849164f

github-actions bot and others added 5 commits September 23, 2021 11:39

Update AutoDoc

7148fcd

fix SerializationTests for TreeConcept

92e098f

removes inject propagation from stores

6a6f19b

fix GroovyIndexedTest: prep serdes

417c0b1

add comment

a91e91b

awildturtok requested changes Sep 27, 2021

View reviewed changes

thoniTUB added 4 commits September 28, 2021 12:40

add documentation

0d157fa

fix loading of executions and FormConfigs

d93c097

removes comment

f37f259

thoniTUB force-pushed the feature/self-inject-storage branch from 8af5868 to f37f259 Compare September 28, 2021 11:47

github-actions bot and others added 6 commits September 28, 2021 11:49

Update AutoDoc

477ccd1

adds comment about checking the storages

22379fe

revert clean shutdown because of port binding problems

2e9bf07

fix removing of datasets in restart test and repeated closing of stores

753ffa9

Update AutoDoc

8067cf7

makes exception to warning

62ba406

thoniTUB requested a review from awildturtok September 28, 2021 13:45

awildturtok approved these changes Sep 28, 2021

View reviewed changes

thoniTUB merged commit 202ec10 into develop Sep 29, 2021

delete-merged-branch bot deleted the feature/self-inject-storage branch September 29, 2021 06:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/self inject storage into permission owners #2101

Feature/self inject storage into permission owners #2101

thoniTUB commented Sep 21, 2021

awildturtok left a comment

awildturtok Sep 24, 2021

thoniTUB Sep 27, 2021

awildturtok Sep 27, 2021

awildturtok Sep 27, 2021

thoniTUB Sep 27, 2021

thoniTUB Sep 27, 2021

Feature/self inject storage into permission owners #2101

Feature/self inject storage into permission owners #2101

Conversation

thoniTUB commented Sep 21, 2021

awildturtok left a comment

Choose a reason for hiding this comment

awildturtok Sep 24, 2021

Choose a reason for hiding this comment

thoniTUB Sep 27, 2021

Choose a reason for hiding this comment

awildturtok Sep 27, 2021

Choose a reason for hiding this comment

awildturtok Sep 27, 2021

Choose a reason for hiding this comment

thoniTUB Sep 27, 2021

Choose a reason for hiding this comment

thoniTUB Sep 27, 2021

Choose a reason for hiding this comment