[java-identity-provider] branch main updated: IDP-2078 field SelectProfileConfiguration#rpCtx never used
Rod Widdowson
rdw at steadingsoftware.com
Thu Apr 6 16:26:12 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=ca80fcdeb819c65c2f7a85be6e8b10eb6657465b
The following commit(s) were added to refs/heads/main by this push:
new ca80fcdeb IDP-2078 field SelectProfileConfiguration#rpCtx never used
ca80fcdeb is described below
commit ca80fcdeb819c65c2f7a85be6e8b10eb6657465b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Apr 6 17:16:02 2023 +0100
IDP-2078 field SelectProfileConfiguration#rpCtx never used
https://shibboleth.atlassian.net/browse/IDP-2078
Fix broken null "fix".
Remove an unused field
Do some drive-by yellow clean up.
---
.../idp/authn/principal/AbstractPrincipalSerializer.java | 15 +++++++++++----
.../idp/authn/principal/PrincipalServiceManager.java | 1 +
.../idp/authn/impl/ValidateExternalAuthentication.java | 1 -
.../net/shibboleth/idp/profile/impl/FilterAttributes.java | 4 ++--
.../shibboleth/idp/profile/impl/ResolveAttributes.java | 1 +
.../messaging/impl/SelectProfileConfiguration.java | 2 +-
.../messaging/impl/SelectRelyingPartyConfiguration.java | 1 +
.../ProfileRequestContextFlowExecutionListener.java | 5 +++--
.../authn/principal/impl/NameIDPrincipalSerializer.java | 8 +++-----
9 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/AbstractPrincipalSerializer.java b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/AbstractPrincipalSerializer.java
index 40ce081c9..53d99b7f5 100644
--- a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/AbstractPrincipalSerializer.java
+++ b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/AbstractPrincipalSerializer.java
@@ -51,8 +51,11 @@ public abstract class AbstractPrincipalSerializer<Type> extends AbstractInitiali
public AbstractPrincipalSerializer() {
final JsonProvider provider = JsonProvider.provider();
assert provider != null;
- generatorFactory = provider.createGeneratorFactory(null);
- readerFactory = provider.createReaderFactory(null);
+ final JsonGeneratorFactory gFactory = provider.createGeneratorFactory(null);
+ final JsonReaderFactory rFactory = provider.createReaderFactory(null);
+ assert gFactory != null && rFactory != null;
+ generatorFactory = gFactory;
+ readerFactory = rFactory;
}
/**
@@ -63,7 +66,9 @@ public abstract class AbstractPrincipalSerializer<Type> extends AbstractInitiali
* @return a generator
*/
@Nonnull protected synchronized JsonGenerator getJsonGenerator(@Nonnull final Writer writer) {
- return generatorFactory.createGenerator(writer);
+ final JsonGenerator jsonGenerator = generatorFactory.createGenerator(writer);
+ assert jsonGenerator!=null;
+ return jsonGenerator;
}
/**
@@ -74,7 +79,9 @@ public abstract class AbstractPrincipalSerializer<Type> extends AbstractInitiali
* @return a reader
*/
@Nonnull protected synchronized JsonReader getJsonReader(@Nonnull final Reader reader) {
- return readerFactory.createReader(reader);
+ final JsonReader jr = readerFactory.createReader(reader);
+ assert jr!=null;
+ return jr;
}
}
\ No newline at end of file
diff --git a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/PrincipalServiceManager.java b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/PrincipalServiceManager.java
index 646e7c925..925375301 100644
--- a/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/PrincipalServiceManager.java
+++ b/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/PrincipalServiceManager.java
@@ -92,6 +92,7 @@ public class PrincipalServiceManager {
*
* @return service for the type, or null
*/
+ @SuppressWarnings("unchecked")
@Nullable public <T extends Principal> PrincipalService<T> byClass(@Nonnull final Class<T> claz) {
final PrincipalService<?> service = classIndexedMap.get(claz);
if (service != null) {
diff --git a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
index bb7b9cc35..ac4e7fbd8 100644
--- a/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
+++ b/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
@@ -29,7 +29,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.security.auth.Subject;
-import org.opensaml.messaging.context.BaseContext;
import org.opensaml.profile.action.ActionSupport;
import org.opensaml.profile.action.EventIds;
import org.opensaml.profile.context.ProfileRequestContext;
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
index faf3a6c25..d4de0d82f 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
@@ -23,7 +23,6 @@ import java.util.function.Function;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import org.opensaml.messaging.context.BaseContext;
import org.opensaml.messaging.context.navigate.ChildContextLookup;
import org.opensaml.messaging.context.navigate.RootContextLookup;
import org.opensaml.profile.action.ActionSupport;
@@ -45,8 +44,8 @@ import net.shibboleth.idp.authn.context.navigate.SubjectContextPrincipalLookupFu
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.IdPEventIds;
import net.shibboleth.profile.context.RelyingPartyContext;
-import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
import net.shibboleth.profile.context.navigate.IssuerLookupFunction;
+import net.shibboleth.profile.context.navigate.RelyingPartyIdLookupFunction;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.service.ReloadableService;
@@ -151,6 +150,7 @@ public class FilterAttributes extends AbstractProfileAction {
*
* @param filterService engine used to filter attributes
*/
+ @SuppressWarnings("null")
public FilterAttributes(@Nonnull final ReloadableService<AttributeFilter> filterService) {
attributeFilterService = Constraint.isNotNull(filterService, "Service cannot be null");
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
index 4f967ef14..8d73341dc 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java
@@ -100,6 +100,7 @@ public final class ResolveAttributes extends AbstractProfileAction {
*
* @param resolverService resolver used to fetch attributes
*/
+ @SuppressWarnings("null")
public ResolveAttributes(@Nonnull final ReloadableService<AttributeResolver> resolverService) {
attributeResolverService = Constraint.isNotNull(resolverService, "AttributeResolver cannot be null");
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/messaging/impl/SelectProfileConfiguration.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/messaging/impl/SelectProfileConfiguration.java
index 1f89665a2..033529821 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/messaging/impl/SelectProfileConfiguration.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/messaging/impl/SelectProfileConfiguration.java
@@ -163,7 +163,7 @@ public class SelectProfileConfiguration extends AbstractMessageHandler {
@Override
protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
- final RelyingPartyContext ctx = rpCtx = relyingPartyContextLookupStrategy.apply(messageContext);
+ final RelyingPartyContext ctx = rpCtx;
assert ctx != null;
final RelyingPartyConfiguration rpConfig = ctx.getConfiguration();
assert rpConfig != null;
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/messaging/impl/SelectRelyingPartyConfiguration.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/messaging/impl/SelectRelyingPartyConfiguration.java
index 209f8c44d..9a9dd1736 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/messaging/impl/SelectRelyingPartyConfiguration.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/messaging/impl/SelectRelyingPartyConfiguration.java
@@ -70,6 +70,7 @@ public final class SelectRelyingPartyConfiguration extends AbstractMessageHandle
@Nullable private RelyingPartyContext relyingPartyCtx;
/** Constructor. */
+ @SuppressWarnings("null")
public SelectRelyingPartyConfiguration() {
relyingPartyContextLookupStrategy =
new ChildContextLookup<>(RelyingPartyContext.class).compose(
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/support/ProfileRequestContextFlowExecutionListener.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/support/ProfileRequestContextFlowExecutionListener.java
index 40c9fee48..8823789c9 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/support/ProfileRequestContextFlowExecutionListener.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/support/ProfileRequestContextFlowExecutionListener.java
@@ -44,9 +44,9 @@ public class ProfileRequestContextFlowExecutionListener implements FlowExecution
@Override
- public void stateEntered(
- final RequestContext context, final StateDefinition previousState, final StateDefinition newState) {
+ public void stateEntered(final RequestContext context, final StateDefinition previousState, final StateDefinition newState) {
if (previousState != null && previousState.getId().startsWith("Initialize")) {
+ assert context != null;
final ProfileRequestContext prc = getProfileRequestContext(context);
final ServletRequest request = getRequest(context);
if (prc != null && request != null) {
@@ -58,6 +58,7 @@ public class ProfileRequestContextFlowExecutionListener implements FlowExecution
@Override
public void resuming(final RequestContext context) {
+ assert context != null;
final ProfileRequestContext prc = getProfileRequestContext(context);
final ServletRequest request = getRequest(context);
if (prc != null && request != null) {
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/authn/principal/impl/NameIDPrincipalSerializer.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/authn/principal/impl/NameIDPrincipalSerializer.java
index 7d23733e2..62f215058 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/authn/principal/impl/NameIDPrincipalSerializer.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/authn/principal/impl/NameIDPrincipalSerializer.java
@@ -74,15 +74,11 @@ public class NameIDPrincipalSerializer extends AbstractPrincipalSerializer<Strin
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(NameIDPrincipalSerializer.class);
- /** JSON object bulder factory. */
- @Nonnull private final JsonBuilderFactory objectBuilderFactory;
-
/** NameID builder. */
@Nonnull private final SAMLObjectBuilder<NameID> nameIDBuilder;
/** Constructor. */
public NameIDPrincipalSerializer() {
- objectBuilderFactory = Json.createBuilderFactory(null);
nameIDBuilder = (SAMLObjectBuilder<NameID>)
XMLObjectProviderRegistrySupport.getBuilderFactory().<NameID>ensureBuilder(
NameID.DEFAULT_ELEMENT_NAME);
@@ -121,7 +117,9 @@ public class NameIDPrincipalSerializer extends AbstractPrincipalSerializer<Strin
gen.writeEnd();
}
- return sink.toString();
+ final String result = sink.toString();
+ assert result != null;
+ return result;
}
/** {@inheritDoc} */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list