[java-identity-provider] branch main updated: Fix some warnings.
Scott Cantor
cantor.2 at osu.edu
Tue Feb 14 15:32:24 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor 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=41f4c31768ffc16b58a236b178758c0b750b54fa
The following commit(s) were added to refs/heads/main by this push:
new 41f4c3176 Fix some warnings.
41f4c3176 is described below
commit 41f4c31768ffc16b58a236b178758c0b750b54fa
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 14 10:32:21 2023 -0500
Fix some warnings.
---
.../idp/profile/config/logic/DetailedErrorsPredicate.java | 8 ++++----
.../java/net/shibboleth/idp/profile/config/package-info.java | 4 +---
.../profile/context/navigate/ResponderIdLookupFunction.java | 8 ++++----
.../context/navigate/ScriptedContextLookupFunction.java | 12 ++++++------
.../context/navigate/SpringEventToViewLookupFunction.java | 6 +++---
.../net/shibboleth/idp/profile/logic/ScriptedPredicate.java | 5 -----
6 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/logic/DetailedErrorsPredicate.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/logic/DetailedErrorsPredicate.java
index 85a4ab569..3cabf0609 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/logic/DetailedErrorsPredicate.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/logic/DetailedErrorsPredicate.java
@@ -20,8 +20,8 @@ package net.shibboleth.idp.profile.config.logic;
import javax.annotation.Nullable;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
+import net.shibboleth.idp.profile.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.profile.context.RelyingPartyContext;
-import net.shibboleth.profile.relyingparty.RelyingPartyConfiguration;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -35,9 +35,9 @@ public class DetailedErrorsPredicate extends AbstractRelyingPartyPredicate {
if (input != null) {
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
- final RelyingPartyConfiguration config = rpc.getConfiguration();
- if (config instanceof net.shibboleth.idp.profile.relyingparty.RelyingPartyConfiguration) {
- return ((net.shibboleth.idp.profile.relyingparty.RelyingPartyConfiguration) config).isDetailedErrors(input);
+ final net.shibboleth.profile.relyingparty.RelyingPartyConfiguration config = rpc.getConfiguration();
+ if (config instanceof RelyingPartyConfiguration) {
+ return ((RelyingPartyConfiguration) config).isDetailedErrors(input);
}
}
}
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/package-info.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/package-info.java
index 76cfae69b..695a2fa1e 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/package-info.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/package-info.java
@@ -16,9 +16,7 @@
*/
/**
- * Classes pertaining to request-time profile configuration options. The classes representing the request-time
- * configuration options for a given profile generally hang off of a
- * {@link net.shibboleth.idp.profile.relyingparty.RelyingPartyConfiguration} but some profile handlers may do this differently.
+ * Classes pertaining to IdP-specific request-time profile configuration options.
*/
package net.shibboleth.idp.profile.config;
\ No newline at end of file
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ResponderIdLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ResponderIdLookupFunction.java
index d9473ad29..c853c55c8 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ResponderIdLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ResponderIdLookupFunction.java
@@ -19,10 +19,10 @@ package net.shibboleth.idp.profile.context.navigate;
import javax.annotation.Nullable;
+import net.shibboleth.idp.profile.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.profile.config.OverriddenIssuerProfileConfiguration;
import net.shibboleth.profile.config.ProfileConfiguration;
import net.shibboleth.profile.context.RelyingPartyContext;
-import net.shibboleth.profile.relyingparty.RelyingPartyConfiguration;
import org.opensaml.profile.context.ProfileRequestContext;
@@ -51,9 +51,9 @@ public class ResponderIdLookupFunction extends AbstractRelyingPartyLookupFunctio
}
}
- final RelyingPartyConfiguration rpConfig = rpc.getConfiguration();
- if (rpConfig instanceof net.shibboleth.idp.profile.relyingparty.RelyingPartyConfiguration) {
- return ((net.shibboleth.idp.profile.relyingparty.RelyingPartyConfiguration) rpConfig).getResponderId(input);
+ final net.shibboleth.profile.relyingparty.RelyingPartyConfiguration rpConfig = rpc.getConfiguration();
+ if (rpConfig instanceof RelyingPartyConfiguration) {
+ return ((RelyingPartyConfiguration) rpConfig).getResponderId(input);
}
}
}
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ScriptedContextLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ScriptedContextLookupFunction.java
index 9de586bf0..8de75eaca 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ScriptedContextLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ScriptedContextLookupFunction.java
@@ -166,7 +166,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws IOException if the file doesn't exist.
*/
@Nonnull
- public static ScriptedContextLookupFunction<ProfileRequestContext> resourceScript(final Resource resource)
+ public static ScriptedContextLookupFunction<ProfileRequestContext> resourceScript(@Nonnull final Resource resource)
throws ScriptException, IOException {
return resourceScript(DEFAULT_ENGINE, resource, null);
}
@@ -182,7 +182,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws IOException if the file doesn't exist.
*/
@Nonnull
- public static ScriptedContextLookupFunction<ProfileRequestContext> resourceScript(final Resource resource,
+ public static ScriptedContextLookupFunction<ProfileRequestContext> resourceScript(@Nonnull final Resource resource,
@Nullable final Class<?> outputType) throws ScriptException, IOException {
return resourceScript(DEFAULT_ENGINE, resource, outputType);
}
@@ -302,8 +302,8 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws IOException if the file doesn't exist.
*/
@Nonnull
- public static ScriptedContextLookupFunction<MessageContext> resourceMessageContextScript(final Resource resource)
- throws ScriptException, IOException {
+ public static ScriptedContextLookupFunction<MessageContext> resourceMessageContextScript(
+ @Nonnull final Resource resource) throws ScriptException, IOException {
return resourceMessageContextScript(DEFAULT_ENGINE, resource, null);
}
@@ -317,8 +317,8 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws IOException if the file doesn't exist.
*/
@Nonnull
- public static ScriptedContextLookupFunction<MessageContext> resourceMessageContextScript(final Resource resource,
- @Nullable final Class<?> outputType) throws ScriptException, IOException {
+ public static ScriptedContextLookupFunction<MessageContext> resourceMessageContextScript(
+ @Nonnull final Resource resource, @Nullable final Class<?> outputType) throws ScriptException, IOException {
return resourceMessageContextScript(DEFAULT_ENGINE, resource, outputType);
}
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringEventToViewLookupFunction.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringEventToViewLookupFunction.java
index 100e41972..81b8c14ed 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringEventToViewLookupFunction.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/SpringEventToViewLookupFunction.java
@@ -17,7 +17,6 @@
package net.shibboleth.idp.profile.context.navigate;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
@@ -26,6 +25,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.primitive.StringSupport;
import org.springframework.webflow.execution.Event;
@@ -43,7 +43,7 @@ public class SpringEventToViewLookupFunction implements Function<Event,String> {
/** Constructor. */
public SpringEventToViewLookupFunction() {
- eventMap = Collections.emptyMap();
+ eventMap = CollectionSupport.emptyMap();
}
/**
@@ -62,7 +62,7 @@ public class SpringEventToViewLookupFunction implements Function<Event,String> {
*/
public void setEventMap(@Nullable @NonnullElements final Map<String,String> map) {
if (map == null) {
- eventMap = Collections.emptyMap();
+ eventMap = CollectionSupport.emptyMap();
} else {
eventMap = new HashMap<>(map.size());
for (final Map.Entry<String,String> entry : map.entrySet()) {
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/ScriptedPredicate.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/ScriptedPredicate.java
index 5c974c36e..4b79e7df3 100644
--- a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/ScriptedPredicate.java
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/ScriptedPredicate.java
@@ -27,12 +27,10 @@ import javax.script.ScriptContext;
import javax.script.ScriptException;
import org.opensaml.profile.context.ProfileRequestContext;
-import org.slf4j.Logger;
import org.springframework.core.io.Resource;
import net.shibboleth.shared.annotation.ParameterName;
import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.scripting.EvaluableScript;
/**
@@ -42,9 +40,6 @@ import net.shibboleth.shared.scripting.EvaluableScript;
public class ScriptedPredicate
extends net.shibboleth.shared.logic.ScriptedPredicate<ProfileRequestContext> {
- /** Class logger. */
- @Nonnull private final Logger log = LoggerFactory.getLogger(ScriptedPredicate.class);
-
/**
* Constructor.
*
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list