[FLAPI-47] [FLAPI-53] [FLAPI-51]

+ removes runtime dependencies for examples (regenerated builders) + fixes a test error + improves email example with new syntax
jonmagic · May 28, 2012 · e0a0e5c · e0a0e5c
1 parent d6d6f4e
commit e0a0e5c
Show file tree

Hide file tree

Showing 90 changed files with 805 additions and 770 deletions.
diff --git a/src/main/java/unquietcode/tools/flapi/MinimumInvocationsException.java b/src/main/java/unquietcode/tools/flapi/MinimumInvocationsException.java
diff --git a/src/main/java/unquietcode/tools/flapi/ObjectWrapper.java b/src/main/java/unquietcode/tools/flapi/ObjectWrapper.java
diff --git a/src/test/java/unquietcode/tools/flapi/ActualDescriptorTest.java b/src/test/java/unquietcode/tools/flapi/ActualDescriptorTest.java
@@ -64,7 +64,5 @@ public void descriptorGenerator() {
 
 			.build()
 		;
-
-		builder.writeToFolder("/Users/bfagin/Documents/Code Projects/Flapi/temp");
 	}
 }
diff --git a/src/test/java/unquietcode/tools/flapi/AtLeast_T.java b/src/test/java/unquietcode/tools/flapi/AtLeast_T.java
@@ -1,7 +1,27 @@
+/*******************************************************************************
+ Copyright 2012 Benjamin Fagin
+
+     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.
+
+
+     Read the included LICENSE.TXT for more information.
+ ******************************************************************************/
+
 package unquietcode.tools.flapi;
 
 import org.junit.Test;
 import unquietcode.tools.flapi.builder.DescriptorGenerator;
+import unquietcode.tools.flapi.builder.MinimumInvocationsException;
 
 /**
  * @author Ben Fagin

diff --git a/src/test/java/unquietcode/tools/flapi/examples/calculator/CalculationHelperImpl.java b/src/test/java/unquietcode/tools/flapi/examples/calculator/CalculationHelperImpl.java
@@ -1,7 +1,7 @@
 package unquietcode.tools.flapi.examples.calculator;
 
-import unquietcode.tools.flapi.ObjectWrapper;
 import unquietcode.tools.flapi.examples.calculator.builder.CalculationHelper;
+import unquietcode.tools.flapi.examples.calculator.builder.ObjectWrapper;
 
 import java.math.BigInteger;
 

diff --git a/src/test/java/unquietcode/tools/flapi/examples/calculator/CalculatorBuilderExample.java b/src/test/java/unquietcode/tools/flapi/examples/calculator/CalculatorBuilderExample.java
@@ -3,10 +3,10 @@
 import org.junit.Test;
 import unquietcode.tools.flapi.Descriptor;
 import unquietcode.tools.flapi.Flapi;
-import unquietcode.tools.flapi.ObjectWrapper;
 import unquietcode.tools.flapi.examples.calculator.builder.CalculationBuilder;
 import unquietcode.tools.flapi.examples.calculator.builder.CalculatorBuilder;
 import unquietcode.tools.flapi.examples.calculator.builder.CalculatorGenerator;
+import unquietcode.tools.flapi.examples.calculator.builder.ObjectWrapper;
 
 import java.math.BigInteger;
 

diff --git a/src/test/java/unquietcode/tools/flapi/examples/calculator/CalculatorHelperImpl.java b/src/test/java/unquietcode/tools/flapi/examples/calculator/CalculatorHelperImpl.java
@@ -1,8 +1,8 @@
 package unquietcode.tools.flapi.examples.calculator;
 
-import unquietcode.tools.flapi.ObjectWrapper;
 import unquietcode.tools.flapi.examples.calculator.builder.CalculationHelper;
 import unquietcode.tools.flapi.examples.calculator.builder.CalculatorHelper;
+import unquietcode.tools.flapi.examples.calculator.builder.ObjectWrapper;
 
 import java.math.BigInteger;
 

diff --git a/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/CalculationBuilder.java b/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/CalculationBuilder.java
@@ -11,7 +11,7 @@
  * Visit http://www.unquietcode.com/flapi for more information.
  * 
  * 
- * Generated on May 12, 2012 24:56:40 CDT using version 0.1
+ * Generated on May 28, 2012 10:12:35 CDT using version 0.2
  * 
  */
 public interface CalculationBuilder<_ReturnType >{

diff --git a/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/CalculationHelper.java b/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/CalculationHelper.java
@@ -11,26 +11,26 @@
  * Visit http://www.unquietcode.com/flapi for more information.
  * 
  * 
- * Generated on May 12, 2012 24:56:40 CDT using version 0.1
+ * Generated on May 28, 2012 10:12:35 CDT using version 0.2
  * 
  */
 public interface CalculationHelper {
 
 
-    void mod(int value);
-
-    void power(int value);
+    void divide(int value);
 
-    void abs();
+    void times(int value);
 
-    void divide(int value);
+    void power(int value);
 
     void minus(int value);
 
-    void times(int value);
+    void abs();
 
     void plus(int value);
 
     void equals();
 
+    void mod(int value);
+
 }
diff --git a/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/CalculatorBuilder.java b/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/CalculatorBuilder.java
@@ -11,7 +11,7 @@
  * Visit http://www.unquietcode.com/flapi for more information.
  * 
  * 
- * Generated on May 12, 2012 24:56:40 CDT using version 0.1
+ * Generated on May 28, 2012 10:12:35 CDT using version 0.2
  * 
  */
 public interface CalculatorBuilder<_ReturnType >{

diff --git a/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/CalculatorGenerator.java b/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/CalculatorGenerator.java
@@ -1,9 +1,6 @@
 
 package unquietcode.tools.flapi.examples.calculator.builder;
 
-import unquietcode.tools.flapi.DescriptorBuilderException;
-import unquietcode.tools.flapi.ObjectWrapper;
-
 
 /**
  * This class was generated using Flapi, the fluent API generator for Java.
@@ -13,7 +10,7 @@
  * Visit http://www.unquietcode.com/flapi for more information.
  * 
  * 
- * Generated on May 12, 2012 24:56:40 CDT using version 0.1
+ * Generated on May 28, 2012 10:12:35 CDT using version 0.2
  * 
  */
 public class CalculatorGenerator {
@@ -22,7 +19,7 @@ public class CalculatorGenerator {
     @SuppressWarnings("unchecked")
     public static CalculatorBuilder<ObjectWrapper> begin(CalculatorHelper helper) {
         if (helper == null) {
-            throw new DescriptorBuilderException("Helper cannot be null.");
+            throw new IllegalArgumentException("Helper cannot be null.");
         }
 
         return new ImplCalculatorBuilder(helper, helper._getReturnValue());

diff --git a/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/CalculatorHelper.java b/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/CalculatorHelper.java
@@ -1,7 +1,6 @@
 
 package unquietcode.tools.flapi.examples.calculator.builder;
 
-import unquietcode.tools.flapi.ObjectWrapper;
 
 
 /**
@@ -12,12 +11,11 @@
  * Visit http://www.unquietcode.com/flapi for more information.
  * 
  * 
- * Generated on May 12, 2012 24:56:40 CDT using version 0.1
+ * Generated on May 28, 2012 10:12:35 CDT using version 0.2
  * 
  */
 public interface CalculatorHelper {
 
-
     ObjectWrapper _getReturnValue();
 
     void $(int startingValue, ObjectWrapper<CalculationHelper> _helper1);

diff --git a/...test/java/unquietcode/tools/flapi/examples/calculator/builder/ImplCalculationBuilder.java b/...test/java/unquietcode/tools/flapi/examples/calculator/builder/ImplCalculationBuilder.java
@@ -11,7 +11,7 @@
  * Visit http://www.unquietcode.com/flapi for more information.
  * 
  * 
- * Generated on May 12, 2012 24:56:40 CDT using version 0.1
+ * Generated on May 28, 2012 10:12:35 CDT using version 0.2
  * 
  */
 public class ImplCalculationBuilder

diff --git a/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/ImplCalculatorBuilder.java b/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/ImplCalculatorBuilder.java
@@ -1,7 +1,6 @@
 
 package unquietcode.tools.flapi.examples.calculator.builder;
 
-import unquietcode.tools.flapi.ObjectWrapper;
 
 
 /**
@@ -12,7 +11,7 @@
  * Visit http://www.unquietcode.com/flapi for more information.
  * 
  * 
- * Generated on May 12, 2012 24:56:40 CDT using version 0.1
+ * Generated on May 28, 2012 10:12:35 CDT using version 0.2
  * 
  */
 public class ImplCalculatorBuilder

diff --git a/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/ObjectWrapper.java b/src/test/java/unquietcode/tools/flapi/examples/calculator/builder/ObjectWrapper.java
@@ -0,0 +1,45 @@
+
+package unquietcode.tools.flapi.examples.calculator.builder;
+
+
+
+/**
+ * This class was generated using Flapi, the fluent API generator for Java.
+ * Modifications to this file will be lost upon regeneration.
+ * You have been warned!
+ * 
+ * Visit http://www.unquietcode.com/flapi for more information.
+ * 
+ * 
+ * Generated on May 28, 2012 10:12:35 CDT using version 0.2
+ * 
+ */
+public class ObjectWrapper<_Type >{
+
+    private _Type _value;
+
+    public ObjectWrapper() {
+    }
+
+    public ObjectWrapper(_Type value) {
+        _value = value;
+    }
+
+    public void set(_Type value) {
+        _value = value;
+    }
+
+    public _Type get() {
+        return _value;
+    }
+
+    @Override
+    public String toString() {
+        if (_value == null) {
+            return null;
+        } else {
+            return _value.toString();
+        }
+    }
+
+}
diff --git a/src/test/java/unquietcode/tools/flapi/examples/email/EmailBuilderExample.java b/src/test/java/unquietcode/tools/flapi/examples/email/EmailBuilderExample.java
@@ -23,12 +23,12 @@ public void descriptorGenerator() {
 				.setDescriptorName("Email")
 				.setReturnType(EmailMessage.class)
 
-				.addMethod("setSubject(String subject)").once()
+				.addMethod("subject(String subject)").once()
 				.addMethod("addRecipient(String emailAddress)").atLeast(1)
-				.addMethod("setSender(String emailAddress)").between(1,1)
+				.addMethod("sender(String emailAddress)").between(1,1)
 				.addMethod("addCC(String emailAddress)").any()
 				.addMethod("addBCC(String emailAddress)").any()
-				.addMethod("setBody(String text)").once()
+				.addMethod("body(String text)").once()
 				.addMethod("addAttachment(java.io.File file)").any()
 				.addMethod("send()").last()
 			.build()
@@ -38,11 +38,11 @@ public void descriptorGenerator() {
 	@Test
 	public void usage() {
 		EmailMessage message = EmailGenerator.compose(new EmailHelperImpl())
-			.setSender("iamthewalrus@hotmail.com")
+			.sender("iamthewalrus@hotmail.com")
 			.addRecipient("unclebob@unquietcode.com")
-			.setSubject("Has you seen my bucket?")
-			.setBody("Dear sir,\nI was wondering, have you seen my bucket? It is small, metallic, somewhat used, " +
-					 "and slightly smells of fish. Please let me know if you have or do ever see it.\n\nThanks!")
+			.subject("Has you seen my bucket?")
+			.body("Dear sir,\nI was wondering, have you seen my bucket? It is small, metallic, somewhat used, " +
+				  "and slightly smells of fish. Please let me know if you have or do ever see it.\n\nThanks!")
 		.send();
 	}
 

diff --git a/src/test/java/unquietcode/tools/flapi/examples/email/EmailHelperImpl.java b/src/test/java/unquietcode/tools/flapi/examples/email/EmailHelperImpl.java
@@ -21,7 +21,7 @@ public EmailMessage _getReturnValue() {
 	}
 
 	@Override
-	public void setSubject(String subject) {
+	public void subject(String subject) {
 		email.setSubject(subject);
 	}
 
@@ -32,12 +32,12 @@ public void send() {
 	}
 
 	@Override
-	public void setSender(String emailAddress) {
+	public void sender(String emailAddress) {
 		email.setSender(emailAddress);
 	}
 
 	@Override
-	public void setBody(String text) {
+	public void body(String text) {
 		email.setBody(text);
 	}
 

diff --git a/src/test/java/unquietcode/tools/flapi/examples/email/builder/EmailBuilder.java b/src/test/java/unquietcode/tools/flapi/examples/email/builder/EmailBuilder.java
@@ -12,7 +12,7 @@
  * Visit http://www.unquietcode.com/flapi for more information.
  * 
  * 
- * Generated on May 13, 2012 24:29:29 CDT using version 0.2
+ * Generated on May 28, 2012 10:14:26 CDT using version 0.2
  * 
  */
 public interface EmailBuilder<_ReturnType >{