+ Moving spring reflection utilities to runtime so that it can be used by

the invocation helper.

+ Documentation updates for 0.6 release and annotations.

+ Guava library updated to 18.0

Author: UnquietCode

Documentation.java

@@ -31,6 +31,9 @@
  * this later)
  */
 
+import unquietcode.tools.flapi.annotations.Between;
+import unquietcode.tools.flapi.annotations.Last;
+
 EmailGenerator.compose(new EmailHelperImpl())
     .sender("HAL9000@gmail.com")
     .addRecipient("dave@unquietcode.com")
@@ -48,6 +51,9 @@
  * new Descriptor using `Flapi.builder()`...`.build()`, making sure to call
  * all of the required methods in between. After the call to build you will
  * have a descriptor which is ready to be generated.
+ *
+ * There are two ways to create a descriptor, via the fluent builder
+ * or by using [annotations]().
  */
 
 Descriptor builder = Flapi.builder()
@@ -59,7 +65,10 @@
 	.addMethod("addRecipient(String emailAddress)").atLeast(1)
 	.addMethod("sender(String emailAddress)").exactly(1)
 	.addMethod("body(String text)").atMost(1)
-	.addMethod("send()").last(EmailMessage.class)
+	.addMethod("send()").last(EmailMessage.import java.lang.Class;
+import java.lang.String;
+
+class)
 .build();
 
 builder.writeToStream(System.out);
@@ -76,7 +85,7 @@
 
 // Start building a new Descriptor. Zero or more `ExecutionListener`
 // instances can be provided. (check out `MethodLogger`, which is
-// quite helpful when debugging an error)
+// helpful when debugging an error)
 Descriptor descriptor = Flapi.builder(ExecutionListener...listeners)
 
 // Set the package for all generated classes. (**required**)
@@ -458,6 +467,61 @@ public enum TestEnum {
 .markAsDeprecated(String reason)
 
 
+/**
+ * ## Annotations
+ *
+ * Yes, you can!
+ */
+
+
+// marks the method as occurring any number of times
+@Any
+
+// marks the method as occurring any tim
+// copy these from the stuff above
+@Any(int group)
+
+//
+@AtLeast(int value)
+void x()
+
+@AtMost(int value)
+
+@AtMost(int value, int group)
+
+@Between(int minin, int maxInc)
+
+@Exactly(int value)
+
+
+
+// marks the method as last
+@Last
+
+// last with return value
+
+@After(int group)
+
+
+// mark a method parameter as a container for another block
+// helper. The chain is constructed by looking at the last parameters
+// marked with the chain info. In the current implementation, the
+// parameters **must** be placed as the last parameters to the method.
+//
+// The types must match the generic signature of the `AtomicReference` object,
+// or else an error will be thrown at runtime.
+@BlockChain(Class<?>[] types)
+
+// provide documentation for the method
+@Documented(String[] value)
+
+// create a new descriptor by introspecting the class,
+// first for Flapi annotations, and then as a generic bean
+Descriptor descriptor = Flapi.create(Class class)
+
+
+
+
 /**
  * ## Thanks!
  * Visit the project [on GitHub](https://github.com/UnquietCode/Flapi)

README.md

@@ -1,5 +1,5 @@
 # Flapi - A fluent API generator for Java
-## v0.5.2 [![Build Status](https://travis-ci.org/UnquietCode/Flapi.png?branch=master)](https://travis-ci.org/UnquietCode/Flapi)
+## v0.6 [![Build Status](https://travis-ci.org/UnquietCode/Flapi.png?branch=master)](https://travis-ci.org/UnquietCode/Flapi)
 
 ### What is it?
 Flapi is a code generation library for creating fluent API's in Java.
@@ -22,6 +22,10 @@ Descriptor builder = Flapi.builder()
 	.addMethod("send()").last(EmailMessage.class)
 .build();
 ```
+##### ...or this:
+```java
+annotation example
+```
 
 ##### ...into this:
 ```java

VERSION.md

@@ -1,3 +1,31 @@
+# Version 0.6
+Flapi Version 0.6 includes a major update to support annotation based configuration
+of descriptors. 
+
+### Annotations
+You can now create descriptors from annotated helper classes and interfaces. See the documentation section on [annotations]() for more details.
+
+## Resolved Issues
+Issues are now handled through GitHub, and historical issues have been migrated from JIRA.
+
+### Features and Improvement
+	+ [FLAPI-188 / #11]: Support for creating descriptors from annotated helper interfaces.
+    + [FLAPI-155 / #52]: Support referencing the current block.
+	+ [FLAPI-185 / #38]: Add @see to generated documentation pointing to actual Helper methods.
+	+ [FLAPI-147 / #36]: Provide Wrapper interface for all blocks.
+
+### Bugs
+	+ [FLAPI-165 / #35]: Get build project working in the reactor build.
+
+### Tasks
+	+ [FLAPI-190 / #34]: Update docs and wiki with annotations info.
+	+ [FLAPI-189 / #17]: Move issues from JIRA to GitHub
+
+The full list of tasks and issues included in the release is available on the project's
+[Issue Tracker](https://github.com/UnquietCode/Flapi/milestones/0.6).
+
+------------------------------------------------
+
 # Version 0.5
 Flapi Version 0.5 has been released! Here are the highlights.
 
@@ -37,7 +65,8 @@ Previously, the wrapper interface was called `$`. Flapi 0.5 has removed all uses
     + [FLAPI-173] - Document method grouping / triggering in wiki.
     + [FLAPI-182] - Create a mailing list / user group for Flapi.
 
-The full list of tasks and issues included in the release is available on the project's [JIRA](https://unquietcode.atlassian.net/secure/ReleaseNote.jspa?projectId=10160&version=10740).
+The full list of tasks and issues included in the release is available on the project's
+[Issue Tracker](https://github.com/UnquietCode/Flapi/issues?q=milestone%3A0.5+milestone%3A0.5.1).
 
 ------------------------------------------------
 
@@ -134,7 +163,7 @@ A brand new documentation page is available at
     + [FLAPI-139] - Create two-column documentation of Flapi features.
 
 The full list of tasks and issues included in the release is available on the project's
-[JIRA](https://unquietcode.atlassian.net/secure/ReleaseNote.jspa?projectId=10160&version=10640).
+[Issue Tracker](https://github.com/UnquietCode/Flapi/issues?q=milestone%3A0.4).
 
 ------------------------------------------------
 
@@ -184,7 +213,7 @@ A screencast which attempts to explain the basic use of Flapi has been posted [h
     * [FLAPI-123] - Add PipedProcess example to project.
 
 The full list of tasks and issues included in the release is available on the project's
-[JIRA](https://unquietcode.atlassian.net/secure/ReleaseNote.jspa?version=10142&styleName=Text&projectId=10160).
+[Issue Tracker](https://github.com/UnquietCode/Flapi/issues?q=milestone%3A0.3).
 
 ------------------------------------------------
 
@@ -209,10 +238,17 @@ This version includes a few notable changes:
 	+ [FLAPI-25] - Create a test harness to test known cases of compilation failures.
 	+ [FLAPI-56] - Incorporate existing examples into tests.
 
+
+The full list of tasks and issues included in the release is available on the project's
+[Issue Tracker](https://github.com/UnquietCode/Flapi/issues?q=milestone%3A0.2).
+
 ------------------------------------------------
 
 # Version 0.1
 Notes also available at: https://github.com/UnquietCode/Flapi/wiki/v0_1
 JIRA: https://unquietcode.atlassian.net/secure/ReleaseNote.jspa?projectId=10160&version=10140
 
 Initial beta release.
+
+The full list of tasks and issues included in the release is available on the project's
+[Issue Tracker](https://github.com/UnquietCode/Flapi/issues?q=milestone%3A0.1).

flapi-runtime/src/main/java/unquietcode/tools/flapi/runtime/BlockInvocationHandler.java

@@ -101,10 +101,10 @@ private Object invokeAndReturn(Method method, Object[] originalArgs, Object prox
 		Method helperMethod;
 
 		// find the helper method
-		try {
-			helperMethod = helper.getClass().getMethod(method.getName(), newTypes);
-		} catch (NoSuchMethodException ex) {
-			throw new IllegalStateException("internal error", ex);
+		helperMethod = SpringMethodUtils.findMethod(helper.getClass(), method.getName(), newTypes);
+
+		if (helperMethod == null) {
+			throw new IllegalStateException("unable to locate method '"+method.getName()+"' on helper");
 		}
 
 		// make accessible if not (debatable as to whether this is a good idea)

…tcode/tools/flapi/SpringMethodUtils.java …ols/flapi/runtime/SpringMethodUtils.javasrc/main/java/unquietcode/tools/flapi/SpringMethodUtils.java renamed to flapi-runtime/src/main/java/unquietcode/tools/flapi/runtime/SpringMethodUtils.java src/main/java/unquietcode/tools/flapi/SpringMethodUtils.java renamed to flapi-runtime/src/main/java/unquietcode/tools/flapi/runtime/SpringMethodUtils.java

@@ -1,24 +1,24 @@
-/*
- * Copyright 2002-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package unquietcode.tools.flapi;
+/*********************************************************************
+ Copyright 2014 the Flapi authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ ********************************************************************/
+package unquietcode.tools.flapi.runtime;
 
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * Method reflection methods copied from Spring Framework's ReflectionUtils class,
@@ -27,6 +27,59 @@
 public class SpringMethodUtils {
 
 
+	/**
+	 * Attempt to find a {@link java.lang.reflect.Method} on the supplied class with the supplied name
+	 * and parameter types. Searches all superclasses up to {@code Object}.
+	 * <p>Returns {@code null} if no {@link java.lang.reflect.Method} can be found.
+	 * @param clazz the class to introspect
+	 * @param name the name of the method
+	 * @param paramTypes the parameter types of the method
+	 * (may be {@code null} to indicate any signature)
+	 * @return the Method object, or {@code null} if none found
+	 */
+	public static Method findMethod(Class<?> clazz, String name, Class<?>... paramTypes) {
+		Objects.requireNonNull(clazz, "Class must not be null");
+		Objects.requireNonNull(name, "Method name must not be null");
+
+		Class<?> searchType = clazz;
+		while (searchType != null) {
+			Method[] methods = (searchType.isInterface() ? searchType.getMethods() : getDeclaredMethods(searchType));
+			for (Method method : methods) {
+				if (name.equals(method.getName()) &&
+						(paramTypes == null || Arrays.equals(paramTypes, method.getParameterTypes()))) {
+					return method;
+				}
+			}
+			searchType = searchType.getSuperclass();
+		}
+		return null;
+	}
+
+
+	/**
+	 * Cache for {@link Class#getDeclaredMethods()}, allowing for fast resolution.
+	 */
+	private static final Map<Class<?>, Reference<Method[]>> declaredMethodsCache = new WeakHashMap<Class<?>, Reference<Method[]>>();
+
+
+
+	/**
+	 * This method retrieves {@link Class#getDeclaredMethods()} from a local cache
+	 * in order to avoid the JVM's SecurityManager check and defensive array copying.
+	 */
+	private static Method[] getDeclaredMethods(Class<?> clazz) {
+		Reference<Method[]> ref = declaredMethodsCache.get(clazz);
+		Method[] result = null;
+		if (ref != null) { result = ref.get(); }
+
+		if (result == null) {
+			result = clazz.getDeclaredMethods();
+			declaredMethodsCache.put(clazz, new SoftReference<Method[]>(result));
+		}
+		return result;
+	}
+
+
 	/**
 	 * Perform the given callback operation on all matching methods of the given
 	 * class and superclasses.
@@ -136,4 +189,7 @@ public interface MethodFilter {
 		 */
 		boolean matches(Method method);
 	}
+
+
+
 }

pom.xml

@@ -221,7 +221,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>14.0.1</version>
+			<version>18.0</version>
 		</dependency>
 
 		<!-- test dependencies -->

src/main/java/unquietcode/tools/flapi/annotations/AnnotationIntrospector.java

@@ -21,14 +21,14 @@
 import unquietcode.tools.flapi.Constants;
 import unquietcode.tools.flapi.DescriptorBuilderException;
 import unquietcode.tools.flapi.IntrospectorSupport;
-import unquietcode.tools.flapi.SpringMethodUtils;
 import unquietcode.tools.flapi.beans.BeanIntrospector;
 import unquietcode.tools.flapi.helpers.AnnotationsHelperImpl;
 import unquietcode.tools.flapi.helpers.DocumentationHelperImpl;
 import unquietcode.tools.flapi.helpers.MethodHelperImpl;
 import unquietcode.tools.flapi.outline.BlockOutline;
 import unquietcode.tools.flapi.outline.DescriptorOutline;
 import unquietcode.tools.flapi.outline.MethodOutline;
+import unquietcode.tools.flapi.runtime.SpringMethodUtils;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
@@ -247,6 +247,7 @@ private void handleMethod(MethodOutline methodOutline, Method method) {
 
 				BlockOutline blockOutline = handleClass(blockChain.value());
 				methodOutline.getBlockChain().add(blockOutline);
+//				methodOutline.getChainParameterPositions().add(i);
 			}
 
 			else {