[java-idp-oidc] branch main updated: Changed visibility of doLookup to make it usable in other packages.
Henri Mikkonen
henri.mikkonen at iki.fi
Fri Mar 12 17:49:10 UTC 2021
This is an automated email from the git hooks/post-receive script.
hjmikkon pushed a commit to branch main
in repository java-idp-oidc.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=4beeffb2f0a933c60254ca845395fb454d91664f
The following commit(s) were added to refs/heads/main by this push:
new 4beeffb2 Changed visibility of doLookup to make it usable in other packages.
4beeffb2 is described below
commit 4beeffb2f0a933c60254ca845395fb454d91664f
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Mar 12 19:49:06 2021 +0200
Changed visibility of doLookup to make it usable in other packages.
---
.../context/navigate/AbstractAuthenticationRequestLookupFunction.java | 2 +-
.../context/navigate/DefaultRequestCodeChallengeLookupFunction.java | 2 +-
.../navigate/DefaultRequestCodeChallengeMethodLookupFunction.java | 2 +-
.../context/navigate/DefaultRequestLoginHintLookupFunction.java | 2 +-
.../profile/context/navigate/DefaultRequestMaxAgeLookupFunction.java | 2 +-
.../op/profile/context/navigate/DefaultRequestNonceLookupFunction.java | 2 +-
.../context/navigate/DefaultRequestRedirectURILookupFunction.java | 2 +-
.../context/navigate/DefaultRequestResponseModeLookupFunction.java | 2 +-
.../context/navigate/DefaultRequestResponseTypeLookupFunction.java | 2 +-
.../op/profile/context/navigate/DefaultRequestStateLookupFunction.java | 2 +-
.../op/profile/context/navigate/DefaultRequestedAcrLookupFunction.java | 2 +-
.../profile/context/navigate/DefaultRequestedClaimsLookupFunction.java | 2 +-
.../profile/context/navigate/DefaultRequestedPromptLookupFunction.java | 2 +-
.../profile/context/navigate/DefaultRequestedScopeLookupFunction.java | 2 +-
.../navigate/AbstractAuthenticationRequestLookupFunctionTest.java | 3 +--
15 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunction.java
index 7b22d5fb..eca55a38 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunction.java
@@ -46,7 +46,7 @@ public abstract class AbstractAuthenticationRequestLookupFunction<T>
* @param req authentication request to perform the lookup from.
* @return lookup value.
*/
- @Nullable abstract T doLookup(@Nonnull AuthenticationRequest req);
+ @Nullable abstract protected T doLookup(@Nonnull AuthenticationRequest req);
/** {@inheritDoc} */
@Nullable
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeChallengeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeChallengeLookupFunction.java
index 5b01746a..6abf656d 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeChallengeLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeChallengeLookupFunction.java
@@ -37,7 +37,7 @@ public class DefaultRequestCodeChallengeLookupFunction extends AbstractAuthentic
private Logger log = LoggerFactory.getLogger(DefaultRequestCodeChallengeLookupFunction.class);
/** {@inheritDoc} */
- @Nullable String doLookup(@Nonnull final AuthenticationRequest req) {
+ @Nullable protected String doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null && getRequestObject().getJWTClaimsSet().getClaim("code_challenge") != null) {
final Object codeChallenge = getRequestObject().getJWTClaimsSet().getClaim("code_challenge");
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeChallengeMethodLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeChallengeMethodLookupFunction.java
index e3b9422d..5c347971 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeChallengeMethodLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestCodeChallengeMethodLookupFunction.java
@@ -38,7 +38,7 @@ public class DefaultRequestCodeChallengeMethodLookupFunction
/** {@inheritDoc} */
@Override
- String doLookup(@Nonnull final AuthenticationRequest req) {
+ protected String doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null &&
getRequestObject().getJWTClaimsSet().getClaim("code_challenge_method") != null) {
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestLoginHintLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestLoginHintLookupFunction.java
index b39123d0..cc298476 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestLoginHintLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestLoginHintLookupFunction.java
@@ -36,7 +36,7 @@ public class DefaultRequestLoginHintLookupFunction extends AbstractAuthenticatio
/** {@inheritDoc} */
@Override
- String doLookup(@Nonnull final AuthenticationRequest req) {
+ protected String doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null && getRequestObject().getJWTClaimsSet().getClaim("login_hint") != null) {
final Object hint = getRequestObject().getJWTClaimsSet().getClaim("login_hint");
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestMaxAgeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestMaxAgeLookupFunction.java
index 19f40808..69142eee 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestMaxAgeLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestMaxAgeLookupFunction.java
@@ -38,7 +38,7 @@ public class DefaultRequestMaxAgeLookupFunction extends AbstractAuthenticationRe
/** {@inheritDoc} */
@Override
- Duration doLookup(@Nonnull final AuthenticationRequest req) {
+ protected Duration doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null && getRequestObject().getJWTClaimsSet().getClaim("max_age") != null) {
return Duration.ofSeconds(getRequestObject().getJWTClaimsSet().getIntegerClaim("max_age"));
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestNonceLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestNonceLookupFunction.java
index b8a0bcd6..abf360c4 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestNonceLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestNonceLookupFunction.java
@@ -37,7 +37,7 @@ public class DefaultRequestNonceLookupFunction extends AbstractAuthenticationReq
/** {@inheritDoc} */
@Override
- Nonce doLookup(@Nonnull final AuthenticationRequest req) {
+ protected Nonce doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null && getRequestObject().getJWTClaimsSet().getClaim("nonce") != null) {
final Object nonce = getRequestObject().getJWTClaimsSet().getClaim("nonce");
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestRedirectURILookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestRedirectURILookupFunction.java
index 96ddf490..5240a99e 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestRedirectURILookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestRedirectURILookupFunction.java
@@ -38,7 +38,7 @@ public class DefaultRequestRedirectURILookupFunction extends AbstractAuthenticat
/** {@inheritDoc} */
@Override
- URI doLookup(@Nonnull final AuthenticationRequest req) {
+ protected URI doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null && getRequestObject().getJWTClaimsSet().getClaim("redirect_uri") != null) {
final Object redirect = getRequestObject().getJWTClaimsSet().getClaim("redirect_uri");
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseModeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseModeLookupFunction.java
index 481695e3..ff6fadd5 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseModeLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseModeLookupFunction.java
@@ -39,7 +39,7 @@ public class DefaultRequestResponseModeLookupFunction
/** {@inheritDoc} */
@Override
- ResponseMode doLookup(@Nonnull final AuthenticationRequest req) {
+ protected ResponseMode doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null && getRequestObject().getJWTClaimsSet().getClaim("response_mode") != null) {
final Object rMode = getRequestObject().getJWTClaimsSet().getClaim("response_mode");
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseTypeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseTypeLookupFunction.java
index e65f27ad..c7cee3c3 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseTypeLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestResponseTypeLookupFunction.java
@@ -38,7 +38,7 @@ public class DefaultRequestResponseTypeLookupFunction
/** {@inheritDoc} */
@Override
- ResponseType doLookup(@Nonnull final AuthenticationRequest req) {
+ protected ResponseType doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null && getRequestObject().getJWTClaimsSet().getClaim("response_type") != null) {
return ResponseType.parse((String) getRequestObject().getJWTClaimsSet().getClaim("response_type"));
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestStateLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestStateLookupFunction.java
index 7aac075d..8bdd6cd6 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestStateLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestStateLookupFunction.java
@@ -37,7 +37,7 @@ public class DefaultRequestStateLookupFunction extends AbstractAuthenticationReq
/** {@inheritDoc} */
@Override
- State doLookup(@Nonnull final AuthenticationRequest req) {
+ protected State doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null && getRequestObject().getJWTClaimsSet().getClaim("state") != null) {
final Object state = getRequestObject().getJWTClaimsSet().getClaim("state");
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedAcrLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedAcrLookupFunction.java
index 7dcae5fd..81752c8e 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedAcrLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedAcrLookupFunction.java
@@ -39,7 +39,7 @@ public class DefaultRequestedAcrLookupFunction extends AbstractAuthenticationReq
/** {@inheritDoc} */
@Override
- List<ACR> doLookup(@Nonnull final AuthenticationRequest req) {
+ protected List<ACR> doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null && getRequestObject().getJWTClaimsSet().getClaim("acr_values") != null) {
final List<ACR> reqObjectAcr = new ArrayList<ACR>();
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedClaimsLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedClaimsLookupFunction.java
index 7a5f873c..c0330a32 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedClaimsLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedClaimsLookupFunction.java
@@ -41,7 +41,7 @@ public class DefaultRequestedClaimsLookupFunction
/** {@inheritDoc} */
@Override
- OIDCClaimsRequest doLookup(@Nonnull final AuthenticationRequest req) {
+ protected OIDCClaimsRequest doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null && getRequestObject().getJWTClaimsSet().getClaim("claims") != null) {
final Object claims = getRequestObject().getJWTClaimsSet().getClaim("claims");
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedPromptLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedPromptLookupFunction.java
index 6f606c44..d731158e 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedPromptLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedPromptLookupFunction.java
@@ -37,7 +37,7 @@ public class DefaultRequestedPromptLookupFunction extends AbstractAuthentication
/** {@inheritDoc} */
@Override
- Prompt doLookup(@Nonnull final AuthenticationRequest req) {
+ protected Prompt doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null && getRequestObject().getJWTClaimsSet().getClaim("prompt") != null) {
return Prompt.parse((String) getRequestObject().getJWTClaimsSet().getClaim("prompt"));
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedScopeLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedScopeLookupFunction.java
index 745ed990..309281be 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedScopeLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/DefaultRequestedScopeLookupFunction.java
@@ -37,7 +37,7 @@ public class DefaultRequestedScopeLookupFunction extends AbstractAuthenticationR
/** {@inheritDoc} */
@Override
- Scope doLookup(@Nonnull final AuthenticationRequest req) {
+ protected Scope doLookup(@Nonnull final AuthenticationRequest req) {
try {
if (getRequestObject() != null && getRequestObject().getJWTClaimsSet().getClaim("scope") != null) {
return Scope.parse((String) getRequestObject().getJWTClaimsSet().getClaim("scope"));
diff --git a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java
index 6a86c3b0..40241f57 100644
--- a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java
@@ -18,7 +18,6 @@
package net.shibboleth.idp.plugin.oidc.op.profile.context.navigate;
import net.shibboleth.idp.plugin.oidc.op.messaging.context.OIDCAuthenticationResponseContext;
-import net.shibboleth.idp.plugin.oidc.op.profile.context.navigate.AbstractAuthenticationRequestLookupFunction;
import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileRequestContextLookup;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
@@ -92,7 +91,7 @@ public class AbstractAuthenticationRequestLookupFunctionTest {
class MockOKLookupFunction extends AbstractAuthenticationRequestLookupFunction<String> {
@Override
- String doLookup(AuthenticationRequest req) {
+ protected String doLookup(AuthenticationRequest req) {
return req != null ? new String("OK") : new String("NOK");
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list