From 5f50c2951a249244dbc12fdee75dc2fb36c1a9ac Mon Sep 17 00:00:00 2001 From: Andrei Arlou Date: Fri, 22 Nov 2019 21:37:50 +0300 Subject: [PATCH] KEYCLOAK-12202 Remove unnecessary modificators for enums and interfaces in module "saml-core" --- .../saml/processing/core/parsers/saml/SAMLParser.java | 2 +- .../core/parsers/saml/assertion/SAMLAssertionQNames.java | 6 +++--- .../core/parsers/saml/metadata/SAMLMetadataQNames.java | 6 +++--- .../core/parsers/saml/protocol/SAMLProtocolQNames.java | 6 +++--- .../processing/core/parsers/saml/xmldsig/XmlDSigQNames.java | 6 +++--- .../core/saml/v2/constants/X500SAMLProfileConstants.java | 2 +- .../org/keycloak/saml/validators/ConditionsValidator.java | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParser.java index c3f192ad31..516caff942 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParser.java @@ -64,7 +64,7 @@ public class SAMLParser extends AbstractParser { // Since we have to support JDK 7, no lambdas are available private interface ParserFactory { - public StaxParser create(); + StaxParser create(); } private static final Map PARSERS = new HashMap<>(); diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionQNames.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionQNames.java index ddf5fec468..9f5d09a12e 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionQNames.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionQNames.java @@ -95,15 +95,15 @@ public enum SAMLAssertionQNames implements HasQName { private final QName qName; - private SAMLAssertionQNames(String localName) { + SAMLAssertionQNames(String localName) { this(JBossSAMLURIConstants.ASSERTION_NSURI, localName); } - private SAMLAssertionQNames(HasQName source) { + SAMLAssertionQNames(HasQName source) { this.qName = source.getQName(); } - private SAMLAssertionQNames(JBossSAMLURIConstants nsUri, String localName) { + SAMLAssertionQNames(JBossSAMLURIConstants nsUri, String localName) { this.qName = new QName(nsUri == null ? null : nsUri.get(), localName); } diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLMetadataQNames.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLMetadataQNames.java index 250748a5df..790ad580bf 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLMetadataQNames.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLMetadataQNames.java @@ -90,15 +90,15 @@ public enum SAMLMetadataQNames implements HasQName { private final QName qName; - private SAMLMetadataQNames(String localName) { + SAMLMetadataQNames(String localName) { this.qName = new QName(JBossSAMLURIConstants.METADATA_NSURI.get(), localName); } - private SAMLMetadataQNames(HasQName source) { + SAMLMetadataQNames(HasQName source) { this.qName = source.getQName(); } - private SAMLMetadataQNames(JBossSAMLURIConstants nsUri, String localName) { + SAMLMetadataQNames(JBossSAMLURIConstants nsUri, String localName) { this.qName = new QName(nsUri == null ? null : nsUri.get(), localName); } diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLProtocolQNames.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLProtocolQNames.java index 6af0a3c1ac..c071eb7f99 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLProtocolQNames.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLProtocolQNames.java @@ -102,15 +102,15 @@ public enum SAMLProtocolQNames implements HasQName { private final QName qName; - private SAMLProtocolQNames(String localName) { + SAMLProtocolQNames(String localName) { this(JBossSAMLURIConstants.PROTOCOL_NSURI, localName); } - private SAMLProtocolQNames(HasQName source) { + SAMLProtocolQNames(HasQName source) { this.qName = source.getQName(); } - private SAMLProtocolQNames(JBossSAMLURIConstants nsUri, String localName) { + SAMLProtocolQNames(JBossSAMLURIConstants nsUri, String localName) { this.qName = new QName(nsUri == null ? null : nsUri.get(), localName); } diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/XmlDSigQNames.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/XmlDSigQNames.java index db9197f4a0..32f2d37a63 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/XmlDSigQNames.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/XmlDSigQNames.java @@ -77,15 +77,15 @@ public enum XmlDSigQNames implements HasQName { private final QName qName; - private XmlDSigQNames(String localName) { + XmlDSigQNames(String localName) { this(JBossSAMLURIConstants.XMLDSIG_NSURI, localName); } - private XmlDSigQNames(HasQName source) { + XmlDSigQNames(HasQName source) { this.qName = source.getQName(); } - private XmlDSigQNames(JBossSAMLURIConstants nsUri, String localName) { + XmlDSigQNames(JBossSAMLURIConstants nsUri, String localName) { this.qName = new QName(nsUri == null ? null : nsUri.get(), localName); } diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/constants/X500SAMLProfileConstants.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/constants/X500SAMLProfileConstants.java index 73971d976c..0c6dbc61cf 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/constants/X500SAMLProfileConstants.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/constants/X500SAMLProfileConstants.java @@ -134,7 +134,7 @@ public enum X500SAMLProfileConstants { lookup.put(s.friendlyName, s.uri); } - private X500SAMLProfileConstants(String friendlyName, String uristr) { + X500SAMLProfileConstants(String friendlyName, String uristr) { this.uri = uristr; this.friendlyName = friendlyName; } diff --git a/saml-core/src/main/java/org/keycloak/saml/validators/ConditionsValidator.java b/saml-core/src/main/java/org/keycloak/saml/validators/ConditionsValidator.java index 7d0313464a..cbc277abd0 100644 --- a/saml-core/src/main/java/org/keycloak/saml/validators/ConditionsValidator.java +++ b/saml-core/src/main/java/org/keycloak/saml/validators/ConditionsValidator.java @@ -41,7 +41,7 @@ public class ConditionsValidator { private static final Logger LOG = Logger.getLogger(ConditionsValidator.class); - public static enum Result { + public enum Result { VALID { @Override public Result joinResult(Result otherResult) { return otherResult; } }, INDETERMINATE { @Override public Result joinResult(Result otherResult) { return otherResult == INVALID ? INVALID : INDETERMINATE; } }, INVALID { @Override public Result joinResult(Result otherResult) { return INVALID; } };