[java-metadata-aggregator] branch master updated: MDA-171 - method contract inconsistent with annotations

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository java-metadata-aggregator.

View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=b0d51f849b1e3876fd3e5c15cfeda8eb9d1a82c0

The following commit(s) were added to refs/heads/master by this push:
       new  b0d51f8   MDA-171 - method contract inconsistent with annotations
b0d51f8 is described below

commit b0d51f849b1e3876fd3e5c15cfeda8eb9d1a82c0
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed Apr 26 16:42:51 2017 +0100

    MDA-171 - method contract inconsistent with annotations
---
 .../shibboleth/metadata/dom/saml/SAMLMetadataSupport.java    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java
index 91de383..69cbe6f 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLMetadataSupport.java
@@ -126,15 +126,11 @@ public final class SAMLMetadataSupport {
      * @param descriptor the descriptor, never <code>null</code>
      * @param extensionName the name of the extension element, never <code>null</code>
      * 
-     * @return the first instance of the extension element or <code>null</code> if either argument is null,
-     *          or no such element exists as an extension of the descriptor
+     * @return the first instance of the extension element or <code>null</code> if
+     *          no such element exists as an extension of the descriptor
      */
-    public static Element getDescriptorExtensions(@Nullable final Element descriptor,
-            @Nullable final QName extensionName) {
-        if (descriptor == null || extensionName == null) {
-            return null;
-        }
-
+    public static Element getDescriptorExtensions(@Nonnull final Element descriptor,
+            @Nonnull final QName extensionName) {
         final List<Element> results = getDescriptorExtensionList(descriptor, extensionName);
         if (results.isEmpty()) {
             return null;

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