[java-identity-provider] branch master updated: Additional generic cleanup.
Scott Cantor
cantor.2 at osu.edu
Tue Aug 27 12:47:41 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=0f2814bbdb581c31044713fe8d1e42e92393db93
The following commit(s) were added to refs/heads/master by this push:
new 0f2814b Additional generic cleanup.
0f2814b is described below
commit 0f2814bbdb581c31044713fe8d1e42e92393db93
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 27 12:47:39 2019 -0400
Additional generic cleanup.
---
.../shibboleth/idp/cas/audit/impl/GatewayLookupFunction.java | 2 +-
.../idp/cas/audit/impl/ProxyGrantingTicketLookupFunction.java | 3 ++-
.../net/shibboleth/idp/cas/audit/impl/RenewLookupFunction.java | 3 ++-
.../shibboleth/idp/cas/audit/impl/ServiceLookupFunction.java | 2 +-
.../idp/cas/audit/impl/StatusCodeLookupFunction.java | 2 +-
.../idp/cas/audit/impl/StatusDetailLookupFunction.java | 2 +-
.../shibboleth/idp/cas/audit/impl/TicketLookupFunction.java | 2 +-
.../idp/cas/flow/impl/BuildRelyingPartyContextAction.java | 6 +++++-
.../idp/cas/flow/impl/BuildSAMLMetadataContextAction.java | 6 +++++-
.../idp/cas/flow/impl/CheckProxyAuthorizationAction.java | 6 +++++-
.../idp/cas/flow/impl/PopulateProtocolErrorAction.java | 5 ++++-
.../cas/flow/impl/PrepareTicketValidationResponseAction.java | 2 +-
.../idp/cas/flow/impl/PublishProtocolMessageAction.java | 6 +++++-
.../idp/cas/flow/impl/UpdateIdPSessionWithSPSessionAction.java | 6 +++++-
.../idp/cas/proxy/impl/HttpClientProxyValidator.java | 10 +++++++++-
.../idp/cas/service/impl/MetadataServiceRegistry.java | 3 +--
.../idp/cas/flow/impl/BuildRelyingPartyContextActionTest.java | 2 +-
.../idp/cas/flow/impl/BuildSAMLMetadataContextActionTest.java | 2 +-
.../idp/cas/flow/impl/CheckProxyAuthorizationActionTest.java | 2 +-
.../idp/cas/flow/impl/PublishProtocolResponseActionTest.java | 4 ++--
.../net/shibboleth/idp/cas/flow/impl/TestContextBuilder.java | 6 +++---
.../idp/cas/proxy/impl/HttpClientProxyValidatorTest.java | 6 +++---
22 files changed, 60 insertions(+), 28 deletions(-)
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/GatewayLookupFunction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/GatewayLookupFunction.java
index 833ed2e..d754153 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/GatewayLookupFunction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/GatewayLookupFunction.java
@@ -54,7 +54,7 @@ public class GatewayLookupFunction implements Function<ProfileRequestContext,Boo
/** {@inheritDoc} */
@Nullable public Boolean apply(@Nullable final ProfileRequestContext input) {
- final ProtocolContext protocolContext = protocolContextFunction.apply(input);
+ final ProtocolContext<?,?> protocolContext = protocolContextFunction.apply(input);
if (protocolContext == null || protocolContext.getRequest() == null) {
return null;
}
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/ProxyGrantingTicketLookupFunction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/ProxyGrantingTicketLookupFunction.java
index ef1793d..4e434e5 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/ProxyGrantingTicketLookupFunction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/ProxyGrantingTicketLookupFunction.java
@@ -34,6 +34,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
* @author Marvin S. Addison
*/
public class ProxyGrantingTicketLookupFunction implements Function<ProfileRequestContext,String> {
+
/** Lookup strategy for protocol context. */
@Nonnull private final Function<ProfileRequestContext,ProtocolContext> protocolContextFunction;
@@ -58,7 +59,7 @@ public class ProxyGrantingTicketLookupFunction implements Function<ProfileReques
* {@inheritDoc}
*/
@Nullable public String apply(@Nullable final ProfileRequestContext input) {
- final ProtocolContext protocolContext = protocolContextFunction.apply(input);
+ final ProtocolContext<?,?> protocolContext = protocolContextFunction.apply(input);
if (protocolContext == null || protocolContext.getRequest() == null) {
return null;
}
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/RenewLookupFunction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/RenewLookupFunction.java
index 1d7baef..d038f0a 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/RenewLookupFunction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/RenewLookupFunction.java
@@ -34,6 +34,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
* @author Marvin S. Addison
*/
public class RenewLookupFunction implements Function<ProfileRequestContext, Boolean> {
+
/** Lookup strategy for protocol context. */
@Nonnull
private final Function<ProfileRequestContext,ProtocolContext> protocolContextFunction;
@@ -58,7 +59,7 @@ public class RenewLookupFunction implements Function<ProfileRequestContext, Bool
* {@inheritDoc}
*/
@Nullable public Boolean apply(@Nullable final ProfileRequestContext input) {
- final ProtocolContext protocolContext = protocolContextFunction.apply(input);
+ final ProtocolContext<?,?> protocolContext = protocolContextFunction.apply(input);
if (protocolContext == null || protocolContext.getRequest() == null) {
return null;
}
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/ServiceLookupFunction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/ServiceLookupFunction.java
index 38afbff..f08c3e3 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/ServiceLookupFunction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/ServiceLookupFunction.java
@@ -60,7 +60,7 @@ public class ServiceLookupFunction implements Function<ProfileRequestContext, St
* {@inheritDoc}
*/
@Nullable public String apply(@Nullable final ProfileRequestContext input) {
- final ProtocolContext protocolContext = protocolContextFunction.apply(input);
+ final ProtocolContext<?,?> protocolContext = protocolContextFunction.apply(input);
if (protocolContext == null || protocolContext.getRequest() == null) {
return null;
}
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/StatusCodeLookupFunction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/StatusCodeLookupFunction.java
index d3b8f0f..dc93d70 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/StatusCodeLookupFunction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/StatusCodeLookupFunction.java
@@ -63,7 +63,7 @@ public class StatusCodeLookupFunction implements Function<ProfileRequestContext,
* {@inheritDoc}
*/
@Nullable public String apply(@Nullable final ProfileRequestContext input) {
- final ProtocolContext protocolContext = protocolContextFunction.apply(input);
+ final ProtocolContext<?,?> protocolContext = protocolContextFunction.apply(input);
if (protocolContext == null || protocolContext.getRequest() == null) {
return null;
}
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/StatusDetailLookupFunction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/StatusDetailLookupFunction.java
index 6065dbb..ebed449 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/StatusDetailLookupFunction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/StatusDetailLookupFunction.java
@@ -59,7 +59,7 @@ public class StatusDetailLookupFunction implements Function<ProfileRequestContex
* {@inheritDoc}
*/
@Nullable public String apply(@Nullable final ProfileRequestContext input) {
- final ProtocolContext protocolContext = protocolContextFunction.apply(input);
+ final ProtocolContext<?,?> protocolContext = protocolContextFunction.apply(input);
if (protocolContext == null || protocolContext.getRequest() == null) {
return null;
}
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/TicketLookupFunction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/TicketLookupFunction.java
index d72b09e..171e66f 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/TicketLookupFunction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/impl/TicketLookupFunction.java
@@ -60,7 +60,7 @@ public class TicketLookupFunction implements Function<ProfileRequestContext, Str
* {@inheritDoc}
*/
@Nullable public String apply(@Nullable final ProfileRequestContext input) {
- final ProtocolContext protocolContext = protocolContextFunction.apply(input);
+ final ProtocolContext<?,?> protocolContext = protocolContextFunction.apply(input);
if (protocolContext == null || protocolContext.getRequest() == null) {
return null;
}
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildRelyingPartyContextAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildRelyingPartyContextAction.java
index 3a685dd..f196418 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildRelyingPartyContextAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildRelyingPartyContextAction.java
@@ -43,10 +43,14 @@ import org.slf4j.LoggerFactory;
* Creates the {@link RelyingPartyContext} as a child of the {@link ProfileRequestContext}. The component queries
* a configured list of {@link ServiceRegistry} until a result is found, otherwise the relying party is treated as
* unverified.
+ *
+ * @param <RequestType> request
+ * @param <ResponseType> response
*
* @author Marvin S. Addison
*/
-public class BuildRelyingPartyContextAction extends AbstractCASProtocolAction {
+public class BuildRelyingPartyContextAction<RequestType,ResponseType>
+ extends AbstractCASProtocolAction<RequestType,ResponseType> {
/** Name of group to which unverified services belong. */
@Nonnull @NotEmpty public static final String UNVERIFIED_GROUP = "unverified";
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSAMLMetadataContextAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSAMLMetadataContextAction.java
index e70095a..aa9b380 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSAMLMetadataContextAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/BuildSAMLMetadataContextAction.java
@@ -40,9 +40,13 @@ import org.opensaml.saml.saml2.metadata.EntityDescriptor;
* <li>{@link ProtocolError#IllegalState IllegalState}</li>
* </ul>
*
+ * @param <RequestType> request
+ * @param <ResponseType> response
+ *
* @author Marvin S. Addison
*/
-public class BuildSAMLMetadataContextAction extends AbstractCASProtocolAction {
+public class BuildSAMLMetadataContextAction<RequestType,ResponseType>
+ extends AbstractCASProtocolAction<RequestType,ResponseType> {
/** CAS service. */
@Nullable private Service service;
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/CheckProxyAuthorizationAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/CheckProxyAuthorizationAction.java
index 6ca0605..817c1b6 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/CheckProxyAuthorizationAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/CheckProxyAuthorizationAction.java
@@ -38,9 +38,13 @@ import org.slf4j.LoggerFactory;
* <li>{@link ProtocolError#ProxyNotAuthorized ProxyNotAuthorized}</li>
* </ul>
*
+ * @param <RequestType> request
+ * @param <ResponseType> response
+ *
* @author Marvin S. Addison
*/
-public class CheckProxyAuthorizationAction extends AbstractCASProtocolAction {
+public class CheckProxyAuthorizationAction<RequestType,ResponseType>
+ extends AbstractCASProtocolAction<RequestType,ResponseType> {
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(CheckProxyAuthorizationAction.class);
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PopulateProtocolErrorAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PopulateProtocolErrorAction.java
index ec9c4ef..6d1ca6a 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PopulateProtocolErrorAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PopulateProtocolErrorAction.java
@@ -39,8 +39,11 @@ import net.shibboleth.idp.profile.ActionSupport;
* Populates error information needed for protocol error messages.
*
* @author Marvin S. Addison
+ *
+ * @param <RequestType> request
*/
-public class PopulateProtocolErrorAction extends AbstractCASProtocolAction {
+public class PopulateProtocolErrorAction<RequestType>
+ extends AbstractCASProtocolAction<RequestType,AbstractProtocolResponse> {
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(PopulateProtocolErrorAction.class);
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PrepareTicketValidationResponseAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PrepareTicketValidationResponseAction.java
index 56fe23f..2822a8b 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PrepareTicketValidationResponseAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PrepareTicketValidationResponseAction.java
@@ -132,7 +132,7 @@ public class PrepareTicketValidationResponseAction extends
throw new ComponentInitializationException("AttributeTranscoderRegistry cannot be null");
}
- final AttributeTranscoder transcoder = new CASStringAttributeTranscoder();
+ final AttributeTranscoder<?> transcoder = new CASStringAttributeTranscoder();
transcoder.initialize();
defaultTranscodingRule = new TranscodingRule(
Collections.singletonMap(AttributeTranscoderRegistry.PROP_TRANSCODER, transcoder));
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PublishProtocolMessageAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PublishProtocolMessageAction.java
index 6bc18e3..481428c 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PublishProtocolMessageAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/PublishProtocolMessageAction.java
@@ -33,9 +33,13 @@ import net.shibboleth.idp.profile.ActionSupport;
* converted to variable case, e.g. <code>TicketValidationResponse</code> is accessible as
* <code>flowScope.ticketValidationResponse</code>.
*
+ * @param <RequestType> request
+ * @param <ResponseType> response
+ *
* @author Marvin S. Addison
*/
-public class PublishProtocolMessageAction extends AbstractCASProtocolAction {
+public class PublishProtocolMessageAction<RequestType,ResponseType>
+ extends AbstractCASProtocolAction<RequestType,ResponseType> {
/** Request/response flag. */
private boolean requestFlag;
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/UpdateIdPSessionWithSPSessionAction.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/UpdateIdPSessionWithSPSessionAction.java
index 6319e17..b973835 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/UpdateIdPSessionWithSPSessionAction.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/impl/UpdateIdPSessionWithSPSessionAction.java
@@ -46,10 +46,14 @@ import org.slf4j.LoggerFactory;
* If the service granted access to indicates participation in SLO via {@link Service#singleLogoutParticipant},
* then a {@link CASSPSession} is created to track the SP session in order that it may receive SLO messages upon
* a request to the CAS <code>/logout</code> URI.
+ *
+ * @param <RequestType> request
+ * @param <ResponseType> response
*
* @author Marvin S. Addison
*/
-public class UpdateIdPSessionWithSPSessionAction extends AbstractCASProtocolAction {
+public class UpdateIdPSessionWithSPSessionAction<RequestType,ResponseType>
+ extends AbstractCASProtocolAction<RequestType,ResponseType> {
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(UpdateIdPSessionWithSPSessionAction.class);
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyValidator.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyValidator.java
index e24708a..1087ec9 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyValidator.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyValidator.java
@@ -178,6 +178,13 @@ public class HttpClientProxyValidator implements ProxyValidator {
}
}
+ /**
+ * Install TLS trust criteria.
+ *
+ * @param context client context
+ * @param requestUri URI to obtain hostname
+ * @param service CAS service
+ */
private static void setCASTLSTrustEngineCriteria(
final HttpClientContext context, final URI requestUri, final Service service) {
final String entityID;
@@ -194,4 +201,5 @@ public class HttpClientProxyValidator implements ProxyValidator {
new TrustedNamesCriterion(Collections.singleton(requestUri.getHost())));
context.setAttribute(CONTEXT_KEY_CRITERIA_SET, criteria);
}
-}
+
+}
\ No newline at end of file
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistry.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistry.java
index 788f9ab..28dbf84 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistry.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/MetadataServiceRegistry.java
@@ -116,9 +116,8 @@ public class MetadataServiceRegistry implements ServiceRegistry {
final RoleDescriptor role = metadataResolver.resolveSingle(criteria(serviceURL));
if (role instanceof SPSSODescriptor) {
return create(serviceURL, (SPSSODescriptor) role);
- } else {
- throw new ResolverException("No compatible role resolved");
}
+ throw new ResolverException("No compatible role resolved");
} catch (final ResolverException e) {
log.warn("Metadata resolution failed for {}", serviceURL, e);
}
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/BuildRelyingPartyContextActionTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/BuildRelyingPartyContextActionTest.java
index 12e81e8..99f36a1 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/BuildRelyingPartyContextActionTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/BuildRelyingPartyContextActionTest.java
@@ -33,7 +33,7 @@ import org.opensaml.profile.action.EventException;
public class BuildRelyingPartyContextActionTest extends AbstractFlowActionTest {
@Autowired
- private BuildRelyingPartyContextAction action;
+ private BuildRelyingPartyContextAction<?,?> action;
@Test
public void testExecuteFromServiceTicketRequest() throws EventException {
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/BuildSAMLMetadataContextActionTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/BuildSAMLMetadataContextActionTest.java
index fb9770f..2644443 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/BuildSAMLMetadataContextActionTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/BuildSAMLMetadataContextActionTest.java
@@ -39,7 +39,7 @@ import static org.testng.Assert.*;
public class BuildSAMLMetadataContextActionTest extends AbstractFlowActionTest {
@Autowired
- private BuildSAMLMetadataContextAction action;
+ private BuildSAMLMetadataContextAction<?,?> action;
private Function<ProfileRequestContext, SAMLMetadataContext> mdLookupFunction =
new SAMLMetadataContextLookupFunction();
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/CheckProxyAuthorizationActionTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/CheckProxyAuthorizationActionTest.java
index 6299185..509a11b 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/CheckProxyAuthorizationActionTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/CheckProxyAuthorizationActionTest.java
@@ -34,7 +34,7 @@ import static org.testng.Assert.*;
public class CheckProxyAuthorizationActionTest extends AbstractFlowActionTest {
@Autowired
- private CheckProxyAuthorizationAction action;
+ private CheckProxyAuthorizationAction<?,?> action;
@Test
public void testProxyAuthorizationSuccess() throws Exception {
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/PublishProtocolResponseActionTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/PublishProtocolResponseActionTest.java
index bf27c0f..64de31f 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/PublishProtocolResponseActionTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/PublishProtocolResponseActionTest.java
@@ -35,7 +35,7 @@ public class PublishProtocolResponseActionTest extends AbstractFlowActionTest {
@Test
public void testPublishRequest() throws Exception {
- final PublishProtocolMessageAction action = new PublishProtocolMessageAction(true);
+ final PublishProtocolMessageAction<?,?> action = new PublishProtocolMessageAction<>(true);
action.initialize();
final RequestContext context = new TestContextBuilder(LoginConfiguration.PROFILE_ID)
.addProtocolContext(new ServiceTicketRequest("A"), new ServiceTicketResponse("A", "B"))
@@ -49,7 +49,7 @@ public class PublishProtocolResponseActionTest extends AbstractFlowActionTest {
@Test
public void testPublishResponse() throws Exception {
- final PublishProtocolMessageAction action = new PublishProtocolMessageAction(false);
+ final PublishProtocolMessageAction<?,?> action = new PublishProtocolMessageAction<>(false);
action.initialize();
final RequestContext context = new TestContextBuilder(LoginConfiguration.PROFILE_ID)
.addProtocolContext(new ServiceTicketRequest("A"), new ServiceTicketResponse("A", "B"))
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/TestContextBuilder.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/TestContextBuilder.java
index 21d0d4c..c4c5729 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/TestContextBuilder.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/flow/impl/TestContextBuilder.java
@@ -72,7 +72,7 @@ public class TestContextBuilder {
}
public TestContextBuilder addProtocolContext(final Object request, final Object response) {
- final ProtocolContext context = new ProtocolContext();
+ final ProtocolContext<Object,Object> context = new ProtocolContext<>();
context.setRequest(request);
context.setResponse(response);
profileRequestContext.addSubcontext(context);
@@ -80,7 +80,7 @@ public class TestContextBuilder {
}
public TestContextBuilder addTicketContext(final Ticket ticket) {
- final ProtocolContext context = profileRequestContext.getSubcontext(ProtocolContext.class, true);
+ final ProtocolContext<?,?> context = profileRequestContext.getSubcontext(ProtocolContext.class, true);
context.addSubcontext(new TicketContext(ticket));
return this;
}
@@ -96,7 +96,7 @@ public class TestContextBuilder {
}
public TestContextBuilder addServiceContext(final Service service) {
- final ProtocolContext context = profileRequestContext.getSubcontext(ProtocolContext.class, true);
+ final ProtocolContext<?,?> context = profileRequestContext.getSubcontext(ProtocolContext.class, true);
context.addSubcontext(new ServiceContext(service));
return this;
}
diff --git a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyValidatorTest.java b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyValidatorTest.java
index 28f2858..83f92ed 100644
--- a/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyValidatorTest.java
+++ b/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyValidatorTest.java
@@ -162,8 +162,8 @@ public class HttpClientProxyValidatorTest extends AbstractFlowActionTest {
final int status;
- public ConfigurableStatusHandler(final int status) {
- this.status = status;
+ public ConfigurableStatusHandler(final int s) {
+ status = s;
}
@Override
@@ -182,7 +182,7 @@ public class HttpClientProxyValidatorTest extends AbstractFlowActionTest {
private ProfileRequestContext buildProfileRequestContext(final String serviceUrl) {
final ProfileRequestContext prc = new ProfileRequestContext();
- final ProtocolContext protoCtx = new ProtocolContext();
+ final ProtocolContext<?,?> protoCtx = new ProtocolContext<>();
prc.addSubcontext(protoCtx);
protoCtx.addSubcontext(new ServiceContext(new Service(serviceUrl, "unknown", true, false)));
return prc;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list