svn commit: r1741939 - in /aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model: Bean.java ProducedBean.java

[cs...@apache.org]

Author: cschneider
Date: Mon May  2 08:54:42 2016
New Revision: 1741939

URL: http://svn.apache.org/viewvc?rev=1741939&view=rev
Log:
[ARIES-1531] Refactor resolve arguments method names. Closes #44

Modified:
    aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
    aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java

Modified: aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java?rev=1741939&r1=1741938&r2=1741939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java (original)
+++ aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/Bean.java Mon May  2 08:54:42 2016
@@ -80,7 +80,7 @@ public class Bean extends BeanRef {
     }
 
     public void resolve(Matcher matcher) {
-        resolveConstructorArguments(matcher);
+        resolveArguments(matcher);
         for (Field field : new Introspector(clazz).fieldsWith(Value.class, Autowired.class, Inject.class)) {
             Property prop = Property.create(matcher, field);
             if (prop != null) {
@@ -89,21 +89,19 @@ public class Bean extends BeanRef {
         }
     }
 
-    protected void resolveConstructorArguments(Matcher matcher) {
+    protected void resolveArguments(Matcher matcher) {
         Constructor<?>[] declaredConstructors = clazz.getDeclaredConstructors();
         for (Constructor constructor : declaredConstructors) {
             Annotation inject = constructor.getAnnotation(Inject.class);
             Annotation autowired = constructor.getAnnotation(Autowired.class);
             if (inject != null || autowired != null || declaredConstructors.length == 1) {
-                Class[] parameterTypes = constructor.getParameterTypes();
-                Annotation[][] parameterAnnotations = constructor.getParameterAnnotations();
-                resolveParametersForConstructor(matcher, parameterTypes, parameterAnnotations);
+                resolveArguments(matcher, constructor.getParameterTypes(), constructor.getParameterAnnotations());
                 break;
             }
         }
     }
 
-    protected void resolveParametersForConstructor(Matcher matcher, Class[] parameterTypes, Annotation[][] parameterAnnotations) {
+    protected void resolveArguments(Matcher matcher, Class[] parameterTypes, Annotation[][] parameterAnnotations) {
         for (int i = 0; i < parameterTypes.length; ++i) {
             Annotation[] annotations = parameterAnnotations[i];
             String ref = null;

Modified: aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java?rev=1741939&r1=1741938&r2=1741939&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java (original)
+++ aries/trunk/blueprint/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/model/ProducedBean.java Mon May  2 08:54:42 2016
@@ -46,7 +46,7 @@ public class ProducedBean extends Bean {
     }
 
     @Override
-    protected void resolveConstructorArguments(Matcher matcher) {
-        resolveParametersForConstructor(matcher, producingMethod.getParameterTypes(), producingMethod.getParameterAnnotations());
+    protected void resolveArguments(Matcher matcher) {
+        resolveArguments(matcher, producingMethod.getParameterTypes(), producingMethod.getParameterAnnotations());
     }
 }