1
0
mirror of synced 2026-05-22 21:33:16 +00:00

Fix Build Errors for Improve AOT RuntimeHits

- Saml2RuntimeHints consistently uses String in separate method for
  to ensure no classpath issues
- Fix Whitespace/Checkstyle
- Add Missing Nullability Annotations
This commit is contained in:
Robert Winch
2026-02-19 10:17:27 -06:00
committed by Rob Winch
parent 2dd2863550
commit 21978cab22
7 changed files with 122 additions and 96 deletions
@@ -16,17 +16,27 @@
package org.springframework.security.acls.aot.hint;
import java.util.stream.Stream;
import org.jspecify.annotations.Nullable;
import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.aot.hint.TypeReference;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.security.acls.domain.*;
import org.springframework.security.acls.model.*;
import java.util.stream.Stream;
import org.springframework.security.acls.domain.AclImpl;
import org.springframework.security.acls.domain.AuditLogger;
import org.springframework.security.acls.domain.BasePermission;
import org.springframework.security.acls.domain.GrantedAuthoritySid;
import org.springframework.security.acls.domain.ObjectIdentityImpl;
import org.springframework.security.acls.domain.PrincipalSid;
import org.springframework.security.acls.model.AccessControlEntry;
import org.springframework.security.acls.model.Acl;
import org.springframework.security.acls.model.AuditableAccessControlEntry;
import org.springframework.security.acls.model.ObjectIdentity;
import org.springframework.security.acls.model.Sid;
/**
* {@link RuntimeHintsRegistrar} for ACL (Access Control List) classes.
@@ -43,26 +53,21 @@ class AclRuntimeHints implements RuntimeHintsRegistrar {
private void registerAclDomainHints(RuntimeHints hints) {
// Register core ACL domain types
Stream.of(Acl.class, AccessControlEntry.class, AuditableAccessControlEntry.class,
ObjectIdentity.class, Sid.class, AclImpl.class, AccessControlEntry.class,
AuditLogger.class, ObjectIdentityImpl.class, PrincipalSid.class, GrantedAuthoritySid.class, BasePermission.class)
.forEach(c -> hints.reflection().registerType(TypeReference.of(c), builder ->
builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
Stream
.of(Acl.class, AccessControlEntry.class, AuditableAccessControlEntry.class, ObjectIdentity.class, Sid.class,
AclImpl.class, AccessControlEntry.class, AuditLogger.class, ObjectIdentityImpl.class,
PrincipalSid.class, GrantedAuthoritySid.class, BasePermission.class)
.forEach((c) -> hints.reflection()
.registerType(TypeReference.of(c),
(builder) -> builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.ACCESS_DECLARED_FIELDS)));
}
private void registerJdbcSchemaHints(RuntimeHints hints) {
String[] sqlFiles = new String[]{
"createAclSchema.sql",
"createAclSchemaMySQL.sql",
"createAclSchemaOracle.sql",
"createAclSchemaPostgres.sql",
"createAclSchemaSqlServer.sql",
"createAclSchemaWithAclClassIdType.sql",
"select.sql"
};
String[] sqlFiles = new String[] { "createAclSchema.sql", "createAclSchemaMySQL.sql",
"createAclSchemaOracle.sql", "createAclSchemaPostgres.sql", "createAclSchemaSqlServer.sql",
"createAclSchemaWithAclClassIdType.sql", "select.sql" };
for (String sqlFile : sqlFiles) {
Resource sqlResource = new ClassPathResource(sqlFile);
if (sqlResource.exists()) {
@@ -17,4 +17,7 @@
/**
* AOT and native image hint support for ACLs.
*/
@NullMarked
package org.springframework.security.acls.aot.hint;
import org.jspecify.annotations.NullMarked;