Skip to content

Commit f94ef1b

Browse files
Added jspecifiy nullable 1
Signed-off-by: Soumik Sarker <ronodhirsoumik@gmail.com>
1 parent b98c72e commit f94ef1b

6 files changed

Lines changed: 12 additions & 9 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/home/soumik-sarker/spring-security/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/jackson/package-info.java

saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/Saml2AuthenticatedPrincipal.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
import java.util.List;
2121
import java.util.Map;
2222

23-
import org.jspecify.annotations.NullUnmarked;
24-
23+
import org.jspecify.annotations.Nullable;
2524
import org.springframework.security.core.AuthenticatedPrincipal;
2625
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
2726
import org.springframework.util.CollectionUtils;
@@ -76,6 +75,7 @@ default Map<String, List<Object>> getAttributes() {
7675
* @return the {@link RelyingPartyRegistration} identifier
7776
* @since 5.6
7877
*/
78+
@Nullable
7979
default String getRelyingPartyRegistrationId() {
8080
return null;
8181
}

saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/registration/BaseOpenSamlAssertingPartyMetadataRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.opensaml.saml.metadata.resolver.index.impl.RoleMetadataIndex;
3232
import org.opensaml.saml.saml2.metadata.EntityDescriptor;
3333
import org.opensaml.saml.saml2.metadata.IDPSSODescriptor;
34-
34+
import org.springframework.lang.NonNull;
3535
import org.springframework.security.saml2.Saml2Exception;
3636
import org.springframework.security.saml2.core.OpenSamlInitializationService;
3737
import org.springframework.util.Assert;

saml2/saml2-service-provider/src/opensaml5Main/java/org/springframework/security/saml2/provider/service/authentication/OpenSaml5AuthenticationProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
import org.opensaml.xmlsec.signature.support.SignatureTrustEngine;
5959

6060
import org.springframework.core.convert.converter.Converter;
61+
import org.springframework.lang.NonNull;
62+
import org.jspecify.annotations.Nullable;
6163
import org.springframework.security.authentication.AbstractAuthenticationToken;
6264
import org.springframework.security.authentication.AuthenticationProvider;
6365
import org.springframework.security.core.Authentication;

saml2/saml2-service-provider/src/opensaml5Main/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepository.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
import java.util.Iterator;
2727
import java.util.function.Consumer;
2828

29-
import net.shibboleth.shared.resolver.CriteriaSet;
30-
import net.shibboleth.shared.xml.ParserPool;
31-
import org.jspecify.annotations.NullMarked;
3229
import org.jspecify.annotations.Nullable;
3330
import org.opensaml.core.criterion.EntityIdCriterion;
3431
import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
@@ -44,15 +41,17 @@
4441
import org.opensaml.xmlsec.config.impl.DefaultSecurityConfigurationBootstrap;
4542
import org.opensaml.xmlsec.signature.support.SignatureTrustEngine;
4643
import org.opensaml.xmlsec.signature.support.impl.ExplicitKeySignatureTrustEngine;
47-
4844
import org.springframework.core.io.DefaultResourceLoader;
4945
import org.springframework.core.io.Resource;
5046
import org.springframework.core.io.ResourceLoader;
47+
import org.springframework.lang.NonNull;
5148
import org.springframework.security.saml2.Saml2Exception;
5249
import org.springframework.security.saml2.core.OpenSamlInitializationService;
5350
import org.springframework.security.saml2.provider.service.registration.BaseOpenSamlAssertingPartyMetadataRepository.MetadataResolverAdapter;
5451
import org.springframework.util.Assert;
5552

53+
import net.shibboleth.shared.resolver.CriteriaSet;
54+
5655
/**
5756
* An implementation of {@link AssertingPartyMetadataRepository} that uses a
5857
* {@link MetadataResolver} to retrieve {@link AssertingPartyMetadata} instances.

saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/authentication/TestCustomOpenSaml5Objects.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import javax.xml.namespace.QName;
2323

24-
import net.shibboleth.shared.xml.ElementSupport;
2524
import org.jspecify.annotations.Nullable;
2625
import org.opensaml.core.xml.AbstractXMLObject;
2726
import org.opensaml.core.xml.AbstractXMLObjectBuilder;
@@ -37,9 +36,11 @@
3736
import org.opensaml.core.xml.util.IndexedXMLObjectChildrenList;
3837
import org.opensaml.saml.common.xml.SAMLConstants;
3938
import org.opensaml.saml.saml2.core.AttributeValue;
39+
import org.springframework.lang.NonNull;
40+
import org.springframework.security.saml2.core.OpenSamlInitializationService;
4041
import org.w3c.dom.Element;
4142

42-
import org.springframework.security.saml2.core.OpenSamlInitializationService;
43+
import net.shibboleth.shared.xml.ElementSupport;
4344

4445
public final class TestCustomOpenSaml5Objects {
4546

0 commit comments

Comments
 (0)