[java-identity-provider] branch master updated: Checkstyle.
Scott Cantor
cantor.2 at osu.edu
Thu Jan 10 10:46:03 EST 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=08ea064b96e9ee1b55387d96fabc7a9e399636d9
The following commit(s) were added to refs/heads/master by this push:
new 08ea064 Checkstyle.
08ea064 is described below
commit 08ea064b96e9ee1b55387d96fabc7a9e399636d9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jan 10 10:45:58 2019 -0500
Checkstyle.
---
.../idp/admin/impl/UnlockPrivateKeys.java | 10 +++++-----
.../idp/cas/protocol/ServiceTicketRequest.java | 14 +++++++++++--
.../idp/cas/protocol/ServiceTicketResponse.java | 16 ++++++++++++---
.../cas/proxy/impl/HttpClientProxyValidator.java | 16 ++++++++-------
...IdPPropertiesApplicationContextInitializer.java | 3 ++-
.../config/navigate/messaging/package-info.java | 22 +++++++++++++++++++++
.../context/navigate/messaging/package-info.java | 22 +++++++++++++++++++++
.../idp/profile/criterion/package-info.java | 23 ++++++++++++++++++++++
.../idp/profile/logic/messaging/package-info.java | 22 +++++++++++++++++++++
.../metadata/RelyingPartyMetadataProvider.java | 2 +-
10 files changed, 131 insertions(+), 19 deletions(-)
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/UnlockPrivateKeys.java b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/UnlockPrivateKeys.java
index 0b4758d..e328db7 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/UnlockPrivateKeys.java
+++ b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/UnlockPrivateKeys.java
@@ -146,11 +146,11 @@ public class UnlockPrivateKeys extends AbstractProfileAction {
}
int i = 0;
- Iterator<MutableCredential> c_iter = credentials.iterator();
- Iterator<Resource> k_iter = keyResources.iterator();
- while (c_iter.hasNext() && k_iter.hasNext()) {
- final MutableCredential cred = c_iter.next();
- final Resource resource = k_iter.next();
+ final Iterator<MutableCredential> cIter = credentials.iterator();
+ final Iterator<Resource> kIter = keyResources.iterator();
+ while (cIter.hasNext() && kIter.hasNext()) {
+ final MutableCredential cred = cIter.next();
+ final Resource resource = kIter.next();
if (keyPasswords[i] == null) {
log.warn("{} Empty password supplied at index {}", getLogPrefix(), i);
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ServiceTicketRequest.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ServiceTicketRequest.java
index 69284a1..f1f6ab3 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ServiceTicketRequest.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ServiceTicketRequest.java
@@ -103,12 +103,22 @@ public class ServiceTicketRequest {
gateway = doNotForce;
}
+ /**
+ * Get whether ticket request is via SAML 1.1 protocol.
+ *
+ * @return whether ticket request is via SAML 1.1 protocol
+ */
public boolean isSAML() {
return saml;
}
- public void setSAML(final boolean saml) {
- this.saml = saml;
+ /**
+ * Set whether ticket request is via SAML 1.1 protocol.
+ *
+ * @param flag flag to set
+ */
+ public void setSAML(final boolean flag) {
+ saml = flag;
}
/**
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ServiceTicketResponse.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ServiceTicketResponse.java
index 93c719a..33327b3 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ServiceTicketResponse.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ServiceTicketResponse.java
@@ -67,12 +67,22 @@ public class ServiceTicketResponse {
return serviceTicket;
}
+ /**
+ * Get whether ticket request is via SAML 1.1 protocol.
+ *
+ * @return whether ticket request is via SAML 1.1 protocol
+ */
public boolean isSaml() {
return saml;
}
-
- public void setSaml(final boolean saml) {
- this.saml = saml;
+
+ /**
+ * Set whether ticket request is via SAML 1.1 protocol.
+ *
+ * @param flag flag to set
+ */
+ public void setSaml(final boolean flag) {
+ saml = flag;
}
/**
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 83b01ba..b4ec3d0 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
@@ -102,9 +102,11 @@ public class HttpClientProxyValidator implements ProxyValidator {
/**
- * Creates a new instance.
+ *
+ * Constructor.
*
- * @param engine Trust engine to use for validating proxy X.509 certificate credentials.
+ * @param client HttpClient to use
+ * @param parameters security parameters for client
*/
public HttpClientProxyValidator(
@Nonnull final HttpClient client, @Nonnull final HttpClientSecurityParameters parameters) {
@@ -123,10 +125,10 @@ public class HttpClientProxyValidator implements ProxyValidator {
allowedResponseCodes = responseCodes;
}
+ /** {@inheritDoc} */
@Override
- public void validate (
- @Nonnull final ProfileRequestContext profileRequestContext, @Nonnull final URI proxyCallbackUri)
- throws GeneralSecurityException {
+ public void validate(@Nonnull final ProfileRequestContext profileRequestContext,
+ @Nonnull final URI proxyCallbackUri) throws GeneralSecurityException {
Constraint.isNotNull(proxyCallbackUri, "Proxy callback URI cannot be null");
if (!HTTPS_SCHEME.equalsIgnoreCase(proxyCallbackUri.getScheme())) {
@@ -151,11 +153,11 @@ public class HttpClientProxyValidator implements ProxyValidator {
* @return HTTP response code.
* @throws GeneralSecurityException On connection errors, e.g. invalid/untrusted cert.
*/
- protected int connect(@Nonnull final URI uri, @Nonnull Service service) throws GeneralSecurityException {
+ protected int connect(@Nonnull final URI uri, @Nonnull final Service service) throws GeneralSecurityException {
final HttpClientContext clientContext = HttpClientContext.create();
HttpClientSecuritySupport.marshalSecurityParameters(clientContext, securityParameters, true);
setCASTLSTrustEngineCriteria(clientContext, uri, service);
- HttpResponse response;
+ final HttpResponse response;
try {
log.debug("Attempting to validate CAS proxy callback URI {}", uri);
final HttpGet request = new HttpGet(uri);
diff --git a/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java b/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java
index 6ca88cf..4fd9111 100644
--- a/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java
+++ b/idp-core/src/main/java/net/shibboleth/idp/spring/IdPPropertiesApplicationContextInitializer.java
@@ -174,7 +174,8 @@ public class IdPPropertiesApplicationContextInitializer
* @throws ConstraintViolationException if the user-defined search location is empty or ends with '/' and
* {@link #isFailFast(ConfigurableApplicationContext)} is true
*/
- @Nonnull @Deprecated public String[] selectSearchLocations(@Nonnull final ConfigurableApplicationContext applicationContext) {
+ @Deprecated
+ @Nonnull public String[] selectSearchLocations(@Nonnull final ConfigurableApplicationContext applicationContext) {
Constraint.isNotNull(applicationContext, "Application context cannot be null");
final String homeProperty = applicationContext.getEnvironment().getProperty(IDP_HOME_PROPERTY);
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/package-info.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/package-info.java
new file mode 100644
index 0000000..239f117
--- /dev/null
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/config/navigate/messaging/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Configuration navigation for IdP-specific messaging configuration.
+ */
+
+package net.shibboleth.idp.profile.config.navigate.messaging;
\ No newline at end of file
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/messaging/package-info.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/messaging/package-info.java
new file mode 100644
index 0000000..8b9b97f
--- /dev/null
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/messaging/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Context navigation for IdP-specific messaging contexts.
+ */
+
+package net.shibboleth.idp.profile.context.navigate.messaging;
\ No newline at end of file
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/criterion/package-info.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/criterion/package-info.java
new file mode 100644
index 0000000..330ec55
--- /dev/null
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/criterion/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * {@link net.shibboleth.utilities.java.support.resolver.Criterion} implementations
+ * for {@link net.shibboleth.idp.profile.FlowDescriptorResolver} use.
+ */
+
+package net.shibboleth.idp.profile.criterion;
\ No newline at end of file
diff --git a/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/messaging/package-info.java b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/messaging/package-info.java
new file mode 100644
index 0000000..ba5ee8e
--- /dev/null
+++ b/idp-profile-api/src/main/java/net/shibboleth/idp/profile/logic/messaging/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Predicates for IdP-specific messaging profiles.
+ */
+
+package net.shibboleth.idp.profile.logic.messaging;
\ No newline at end of file
diff --git a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
index 154a43c..8b8d9c7 100644
--- a/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
+++ b/idp-saml-api/src/main/java/net/shibboleth/idp/saml/metadata/RelyingPartyMetadataProvider.java
@@ -176,7 +176,7 @@ public class RelyingPartyMetadataProvider extends AbstractServiceableComponent<M
}
/** {@inheritDoc} */
- public void clear(String entityID) throws ResolverException {
+ public void clear(final String entityID) throws ResolverException {
if (resolver instanceof ClearableMetadataResolver) {
((ClearableMetadataResolver) resolver).clear(entityID);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list