[java-idp-oidc] branch main updated: Checkstyle improvements.

[Henri Mikkonen]

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=f321c0fa8d77eb69c242f862e3ed83bb0b52a676

The following commit(s) were added to refs/heads/main by this push:
     new f321c0fa Checkstyle improvements.
f321c0fa is described below

commit f321c0fa8d77eb69c242f862e3ed83bb0b52a676
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Mar 25 13:57:22 2022 +0200

    Checkstyle improvements.
---
 .../idp/plugin/oidc/op/profile/impl/ValidateGrant.java           | 4 ++--
 idp-oidc-extension-impl/src/test/resources/conf/idp.properties   | 9 ++++++++-
 resources/checkstyle-suppressions.xml                            | 9 +++++++++
 resources/checkstyle.xml                                         | 4 ++++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrant.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrant.java
index 33cf70c2..6a8920e4 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrant.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/impl/ValidateGrant.java
@@ -177,7 +177,7 @@ public class ValidateGrant extends AbstractOIDCTokenResponseAction {
         return true;
     }
     
-// Checkstyle: CyclomaticComplexity|MethodLength OFF
+// Checkstyle: CyclomaticComplexity|MethodLength|ReturnCount OFF
     /** {@inheritDoc} */
     @Override
     protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
@@ -258,6 +258,6 @@ public class ValidateGrant extends AbstractOIDCTokenResponseAction {
         }
         getOidcResponseContext().setAuthorizationGrantClaimsSet(tokenClaimsSet);
     }
-// Checkstyle: CyclomaticComplexity|MethodLength ON
+// Checkstyle: CyclomaticComplexity|MethodLength|ReturnCount ON
 
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/idp.properties b/idp-oidc-extension-impl/src/test/resources/conf/idp.properties
index b4137101..d78cd539 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/idp.properties
+++ b/idp-oidc-extension-impl/src/test/resources/conf/idp.properties
@@ -3,7 +3,14 @@
 #idp.searchForProperties = false
 
 # Load any additional property resources from a comma-delimited list
-idp.additionalProperties = /conf/ldap.properties, /conf/saml-nameid.properties, /conf/services.properties, /conf/admin/admin.properties, /conf/authn/authn.properties, /conf/authn/duo.properties, /conf/oidc.properties, /credentials/secrets.properties
+idp.additionalProperties = /conf/ldap.properties, \
+    /conf/saml-nameid.properties, \
+    /conf/services.properties, \
+    /conf/admin/admin.properties, \
+    /conf/authn/authn.properties, \
+    /conf/authn/duo.properties, \
+    /conf/oidc.properties, \
+    /credentials/secrets.properties
 
 # In most cases (and unless noted in the surrounding comments) the
 # commented settings in the distributed files are the default
diff --git a/resources/checkstyle-suppressions.xml b/resources/checkstyle-suppressions.xml
new file mode 100644
index 00000000..d1027917
--- /dev/null
+++ b/resources/checkstyle-suppressions.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+  "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+  "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+
+<suppressions>
+    <suppress checks="FileLength" files="net[\\/]shibboleth[\\/]idp[\\/]plugin[\\/]oidc[\\/]op[\\/]token[\\/]support[\\/]TokenClaimsSet.java" />
+</suppressions>
diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index 50f94908..e3f12038 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -115,4 +115,8 @@
   <module name="LineLength">
     <property name="max" value="120"/>
   </module>
+  <module name="SuppressionFilter">
+    <property name="file" value="resources/checkstyle-suppressions.xml"/>
+    <property name="optional" value="false"/>
+  </module>
 </module>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.