Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5B75617F93 for ; Tue, 26 May 2015 07:14:51 +0000 (UTC) Received: (qmail 2830 invoked by uid 500); 26 May 2015 07:14:51 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 2800 invoked by uid 500); 26 May 2015 07:14:51 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 2789 invoked by uid 99); 26 May 2015 07:14:51 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 May 2015 07:14:51 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 0D63DAC09A4 for ; Tue, 26 May 2015 07:14:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1681692 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java Date: Tue, 26 May 2015 07:14:50 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150526071451.0D63DAC09A4@hades.apache.org> Author: struberg Date: Tue May 26 07:14:50 2015 New Revision: 1681692 URL: http://svn.apache.org/r1681692 Log: OWB-812 extract common nullcheck paramete Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java?rev=1681692&r1=1681691&r2=1681692&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java Tue May 26 07:14:50 2015 @@ -188,7 +188,7 @@ public final class AnnotationManager */ public boolean hasInterceptorBindingMetaAnnotation(Annotation[] anns) { - Asserts.assertNotNull(anns, "anns"); + Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION); for (Annotation ann : anns) { @@ -220,7 +220,7 @@ public final class AnnotationManager */ public Annotation[] getInterceptorBindingMetaAnnotations(Annotation[] anns) { - Asserts.assertNotNull(anns, "anns"); + Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION); List interAnns = new ArrayList(); for (final Annotation ann : anns) @@ -366,21 +366,21 @@ public final class AnnotationManager /** * Gets the array of qualifier annotations on the given array. * - * @param annotations annotation array + * @param anns annotation array * @return array containing qualifier anns */ - public Set getQualifierAnnotations(Collection annotations) + public Set getQualifierAnnotations(Collection anns) { - Asserts.assertNotNull(annotations, "annotations"); + Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION); - if (annotations.isEmpty()) + if (anns.isEmpty()) { return DefaultLiteral.SET; } Set set = new HashSet(); - for (Annotation annot : annotations) + for (Annotation annot : anns) { if (isQualifierAnnotation(annot.annotationType())) { @@ -520,7 +520,7 @@ public final class AnnotationManager public boolean hasStereoTypeMetaAnnotation(Set> anns) { - Asserts.assertNotNull(anns, "anns"); + Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION); for (Class ann : anns) { @@ -535,7 +535,7 @@ public final class AnnotationManager public boolean hasStereoTypeMetaAnnotation(Annotation[] anns) { - Asserts.assertNotNull(anns, "anns"); + Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION); for (Annotation ann : anns) { @@ -550,7 +550,7 @@ public final class AnnotationManager public Annotation[] getStereotypeMetaAnnotations(Annotation[] anns) { - Asserts.assertNotNull(anns, "anns"); + Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION); List interAnns = new ArrayList(); for (Annotation ann : anns)