Merge branch '7.10' of github.com:gchq/stroom

stroomdev66 · stroomdev66 · commit e18a1684c185 · 2025-09-16T13:51:31.000+01:00
diff --git a/stroom-core-shared/src/main/java/stroom/security/shared/CreateHashedApiKeyRequest.java b/stroom-core-shared/src/main/java/stroom/security/shared/CreateHashedApiKeyRequest.java
@@ -49,7 +49,7 @@ private CreateHashedApiKeyRequest() {
                 .builder()
                 .withOwner(UserRef.builder().build())
                 .withName("test")
-                .withHashAlgorithm(HashAlgorithm.BCRYPT));
+                .withHashAlgorithm(ApiKeyHashAlgorithm.BCRYPT));
     }
 
     private CreateHashedApiKeyRequest(final Builder builder) {
diff --git a/stroom-core-shared/src/main/java/stroom/security/shared/HashedApiKey.java b/stroom-core-shared/src/main/java/stroom/security/shared/HashedApiKey.java
@@ -85,7 +85,7 @@ public HashedApiKey(@JsonProperty("id") final Integer id,
     private HashedApiKey() {
         this(HashedApiKey
                 .builder()
-                .withHashAlgorithm(HashAlgorithm.BCRYPT));
+                .withHashAlgorithm(ApiKeyHashAlgorithm.BCRYPT));
     }
 
     private HashedApiKey(final Builder builder) {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ private CreateHashedApiKeyRequest() {`
`49`	`49`	`.builder()`
`50`	`50`	`.withOwner(UserRef.builder().build())`
`51`	`51`	`.withName("test")`
`52`		`- .withHashAlgorithm(HashAlgorithm.BCRYPT));`
	`52`	`+ .withHashAlgorithm(ApiKeyHashAlgorithm.BCRYPT));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`private CreateHashedApiKeyRequest(final Builder builder) {`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public HashedApiKey(@JsonProperty("id") final Integer id,`
`85`	`85`	`private HashedApiKey() {`
`86`	`86`	`this(HashedApiKey`
`87`	`87`	`.builder()`
`88`		`- .withHashAlgorithm(HashAlgorithm.BCRYPT));`
	`88`	`+ .withHashAlgorithm(ApiKeyHashAlgorithm.BCRYPT));`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`private HashedApiKey(final Builder builder) {`