upgraded to 1.2.4.BUILD-SNAPSHOT with no problems

krimple · Jun 4, 2013 · a297650 · a297650
1 parent 92471a6
commit a297650
Show file tree

Hide file tree

Showing 16 changed files with 103 additions and 47 deletions.
diff --git a/chapter-03-jpa/coursemanager-repository/pom.xml b/chapter-03-jpa/coursemanager-repository/pom.xml
@@ -10,7 +10,7 @@
         <aspectj.version>1.6.12.M2</aspectj.version>
         <java.version>1.6</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <roo.version>1.2.3.RELEASE</roo.version>
+        <roo.version>1.2.4.BUILD-SNAPSHOT</roo.version>
         <slf4j.version>1.6.2</slf4j.version>
         <spring.version>3.1.0.RELEASE</spring.version>
     </properties>

diff --git a/chapter-03-jpa/coursemanager/coursemanagerch3.properties b/chapter-03-jpa/coursemanager/coursemanagerch3.properties
@@ -1,5 +1,5 @@
 #HSQL Database Engine 1.8.0.10
-#Mon Dec 24 11:17:59 EST 2012
+#Tue Jun 04 16:08:04 EDT 2013
 hsqldb.script_format=0
 runtime.gc_interval=0
 sql.enforce_strict_size=false

diff --git a/chapter-03-jpa/coursemanager/pom.xml b/chapter-03-jpa/coursemanager/pom.xml
@@ -10,7 +10,7 @@
         <aspectj.version>1.6.12.M2</aspectj.version>
         <java.version>1.6</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <roo.version>1.2.3.RELEASE</roo.version>
+        <roo.version>1.2.4.BUILD-SNAPSHOT</roo.version>
         <slf4j.version>1.6.2</slf4j.version>
         <spring.version>3.1.0.RELEASE</spring.version>
     </properties>

diff --git a/.../src/test/java/org/rooinaction/coursemanager/model/CourseDataOnDemand_Roo_DataOnDemand.aj b/.../src/test/java/org/rooinaction/coursemanager/model/CourseDataOnDemand_Roo_DataOnDemand.aj
@@ -109,13 +109,13 @@ privileged aspect CourseDataOnDemand_Roo_DataOnDemand {
             Course obj = getNewTransientCourse(i);
             try {
                 obj.persist();
-            } catch (ConstraintViolationException e) {
-                StringBuilder msg = new StringBuilder();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getConstraintDescriptor()).append(":").append(cv.getMessage()).append("=").append(cv.getInvalidValue()).append("]");
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
-                throw new RuntimeException(msg.toString(), e);
+                throw new IllegalStateException(msg.toString(), e);
             }
             obj.flush();
             data.add(obj);

diff --git a/...est/java/org/rooinaction/coursemanager/model/CourseIntegrationTest_Roo_IntegrationTest.aj b/...est/java/org/rooinaction/coursemanager/model/CourseIntegrationTest_Roo_IntegrationTest.aj
@@ -3,7 +3,10 @@
 
 package org.rooinaction.coursemanager.model;
 
+import java.util.Iterator;
 import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,7 +22,7 @@ privileged aspect CourseIntegrationTest_Roo_IntegrationTest {
 
     declare @type: CourseIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
 
-    declare @type: CourseIntegrationTest: @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml");
+    declare @type: CourseIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
 
     declare @type: CourseIntegrationTest: @Transactional;
 
@@ -101,7 +104,16 @@ privileged aspect CourseIntegrationTest_Roo_IntegrationTest {
         Course obj = dod.getNewTransientCourse(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'Course' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'Course' identifier to be null", obj.getId());
-        obj.persist();
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
         obj.flush();
         Assert.assertNotNull("Expected 'Course' identifier to no longer be null", obj.getId());
     }

diff --git a/chapter-04-jpa-advanced/coursemanager/pom.xml b/chapter-04-jpa-advanced/coursemanager/pom.xml
@@ -10,7 +10,7 @@
 		<aspectj.version>1.6.12.M2</aspectj.version>
 		<java.version>1.6</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<roo.version>1.2.3.RELEASE</roo.version>
+		<roo.version>1.2.4.BUILD-SNAPSHOT</roo.version>
 		<slf4j.version>1.6.2</slf4j.version>
 		<spring.version>3.1.0.RELEASE</spring.version>
 	</properties>

diff --git a/...ced/coursemanager/src/main/java/org/rooinaction/coursemanager/model/PaymentPK_Roo_Json.aj b/...ced/coursemanager/src/main/java/org/rooinaction/coursemanager/model/PaymentPK_Roo_Json.aj
@@ -16,6 +16,10 @@ privileged aspect PaymentPK_Roo_Json {
         return new JSONSerializer().exclude("*.class").serialize(this);
     }
 
+    public String PaymentPK.toJson(String[] fields) {
+        return new JSONSerializer().include(fields).exclude("*.class").serialize(this);
+    }
+
     public static PaymentPK PaymentPK.fromJsonToPaymentPK(String json) {
         return new JSONDeserializer<PaymentPK>().use(null, PaymentPK.class).deserialize(json);
     }
@@ -24,6 +28,10 @@ privileged aspect PaymentPK_Roo_Json {
         return new JSONSerializer().exclude("*.class").serialize(collection);
     }
 
+    public static String PaymentPK.toJsonArray(Collection<PaymentPK> collection, String[] fields) {
+        return new JSONSerializer().include(fields).exclude("*.class").serialize(collection);
+    }
+
     public static Collection<PaymentPK> PaymentPK.fromJsonArrayToPaymentPKs(String json) {
         return new JSONDeserializer<List<PaymentPK>>().use(null, ArrayList.class).use("values", PaymentPK.class).deserialize(json);
     }

diff --git a/.../src/test/java/org/rooinaction/coursemanager/model/CourseDataOnDemand_Roo_DataOnDemand.aj b/.../src/test/java/org/rooinaction/coursemanager/model/CourseDataOnDemand_Roo_DataOnDemand.aj
@@ -111,13 +111,13 @@ privileged aspect CourseDataOnDemand_Roo_DataOnDemand {
             Course obj = getNewTransientCourse(i);
             try {
                 obj.persist();
-            } catch (ConstraintViolationException e) {
-                StringBuilder msg = new StringBuilder();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getConstraintDescriptor()).append(":").append(cv.getMessage()).append("=").append(cv.getInvalidValue()).append("]");
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
-                throw new RuntimeException(msg.toString(), e);
+                throw new IllegalStateException(msg.toString(), e);
             }
             obj.flush();
             data.add(obj);

diff --git a/...rc/test/java/org/rooinaction/coursemanager/model/OfferingDataOnDemand_Roo_DataOnDemand.aj b/...rc/test/java/org/rooinaction/coursemanager/model/OfferingDataOnDemand_Roo_DataOnDemand.aj
@@ -88,13 +88,13 @@ privileged aspect OfferingDataOnDemand_Roo_DataOnDemand {
             Offering obj = getNewTransientOffering(i);
             try {
                 obj.persist();
-            } catch (ConstraintViolationException e) {
-                StringBuilder msg = new StringBuilder();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getConstraintDescriptor()).append(":").append(cv.getMessage()).append("=").append(cv.getInvalidValue()).append("]");
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
-                throw new RuntimeException(msg.toString(), e);
+                throw new IllegalStateException(msg.toString(), e);
             }
             obj.flush();
             data.add(obj);

diff --git a/...est/java/org/rooinaction/coursemanager/model/RegistrationDataOnDemand_Roo_DataOnDemand.aj b/...est/java/org/rooinaction/coursemanager/model/RegistrationDataOnDemand_Roo_DataOnDemand.aj
@@ -88,13 +88,13 @@ privileged aspect RegistrationDataOnDemand_Roo_DataOnDemand {
             Registration obj = getNewTransientRegistration(i);
             try {
                 obj.persist();
-            } catch (ConstraintViolationException e) {
-                StringBuilder msg = new StringBuilder();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getConstraintDescriptor()).append(":").append(cv.getMessage()).append("=").append(cv.getInvalidValue()).append("]");
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
-                throw new RuntimeException(msg.toString(), e);
+                throw new IllegalStateException(msg.toString(), e);
             }
             obj.flush();
             data.add(obj);

diff --git a/...src/test/java/org/rooinaction/coursemanager/model/StudentDataOnDemand_Roo_DataOnDemand.aj b/...src/test/java/org/rooinaction/coursemanager/model/StudentDataOnDemand_Roo_DataOnDemand.aj
@@ -175,13 +175,13 @@ privileged aspect StudentDataOnDemand_Roo_DataOnDemand {
             Student obj = getNewTransientStudent(i);
             try {
                 obj.persist();
-            } catch (ConstraintViolationException e) {
-                StringBuilder msg = new StringBuilder();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getConstraintDescriptor()).append(":").append(cv.getMessage()).append("=").append(cv.getInvalidValue()).append("]");
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
-                throw new RuntimeException(msg.toString(), e);
+                throw new IllegalStateException(msg.toString(), e);
             }
             obj.flush();
             data.add(obj);

diff --git a/...st/java/org/rooinaction/coursemanager/model/StudentIntegrationTest_Roo_IntegrationTest.aj b/...st/java/org/rooinaction/coursemanager/model/StudentIntegrationTest_Roo_IntegrationTest.aj
@@ -3,7 +3,10 @@
 
 package org.rooinaction.coursemanager.model;
 
+import java.util.Iterator;
 import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,7 +22,7 @@ privileged aspect StudentIntegrationTest_Roo_IntegrationTest {
 
     declare @type: StudentIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
 
-    declare @type: StudentIntegrationTest: @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml");
+    declare @type: StudentIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
 
     declare @type: StudentIntegrationTest: @Transactional;
 
@@ -101,7 +104,16 @@ privileged aspect StudentIntegrationTest_Roo_IntegrationTest {
         Student obj = dod.getNewTransientStudent(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'Student' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'Student' identifier to be null", obj.getId());
-        obj.persist();
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
         obj.flush();
         Assert.assertNotNull("Expected 'Student' identifier to no longer be null", obj.getId());
     }

diff --git a/...ger/src/test/java/org/rooinaction/coursemanager/model/TagDataOnDemand_Roo_DataOnDemand.aj b/...ger/src/test/java/org/rooinaction/coursemanager/model/TagDataOnDemand_Roo_DataOnDemand.aj
@@ -85,13 +85,13 @@ privileged aspect TagDataOnDemand_Roo_DataOnDemand {
             Tag obj = getNewTransientTag(i);
             try {
                 obj.persist();
-            } catch (ConstraintViolationException e) {
-                StringBuilder msg = new StringBuilder();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getConstraintDescriptor()).append(":").append(cv.getMessage()).append("=").append(cv.getInvalidValue()).append("]");
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
-                throw new RuntimeException(msg.toString(), e);
+                throw new IllegalStateException(msg.toString(), e);
             }
             obj.flush();
             data.add(obj);

diff --git a/...c/test/java/org/rooinaction/coursemanager/model/TagIntegrationTest_Roo_IntegrationTest.aj b/...c/test/java/org/rooinaction/coursemanager/model/TagIntegrationTest_Roo_IntegrationTest.aj
@@ -3,7 +3,10 @@
 
 package org.rooinaction.coursemanager.model;
 
+import java.util.Iterator;
 import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,7 +22,7 @@ privileged aspect TagIntegrationTest_Roo_IntegrationTest {
 
     declare @type: TagIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
 
-    declare @type: TagIntegrationTest: @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml");
+    declare @type: TagIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
 
     declare @type: TagIntegrationTest: @Transactional;
 
@@ -101,7 +104,16 @@ privileged aspect TagIntegrationTest_Roo_IntegrationTest {
         Tag obj = dod.getNewTransientTag(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'Tag' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'Tag' identifier to be null", obj.getId());
-        obj.persist();
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
         obj.flush();
         Assert.assertNotNull("Expected 'Tag' identifier to no longer be null", obj.getId());
     }

diff --git a/.../java/org/rooinaction/coursemanager/model/TrainingProgramDataOnDemand_Roo_DataOnDemand.aj b/.../java/org/rooinaction/coursemanager/model/TrainingProgramDataOnDemand_Roo_DataOnDemand.aj
@@ -73,13 +73,13 @@ privileged aspect TrainingProgramDataOnDemand_Roo_DataOnDemand {
             TrainingProgram obj = getNewTransientTrainingProgram(i);
             try {
                 obj.persist();
-            } catch (ConstraintViolationException e) {
-                StringBuilder msg = new StringBuilder();
+            } catch (final ConstraintViolationException e) {
+                final StringBuilder msg = new StringBuilder();
                 for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
-                    ConstraintViolation<?> cv = iter.next();
-                    msg.append("[").append(cv.getConstraintDescriptor()).append(":").append(cv.getMessage()).append("=").append(cv.getInvalidValue()).append("]");
+                    final ConstraintViolation<?> cv = iter.next();
+                    msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
                 }
-                throw new RuntimeException(msg.toString(), e);
+                throw new IllegalStateException(msg.toString(), e);
             }
             obj.flush();
             data.add(obj);

diff --git a/...org/rooinaction/coursemanager/model/TrainingProgramIntegrationTest_Roo_IntegrationTest.aj b/...org/rooinaction/coursemanager/model/TrainingProgramIntegrationTest_Roo_IntegrationTest.aj
@@ -3,7 +3,10 @@
 
 package org.rooinaction.coursemanager.model;
 
+import java.util.Iterator;
 import java.util.List;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,7 +22,7 @@ privileged aspect TrainingProgramIntegrationTest_Roo_IntegrationTest {
 
     declare @type: TrainingProgramIntegrationTest: @RunWith(SpringJUnit4ClassRunner.class);
 
-    declare @type: TrainingProgramIntegrationTest: @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext*.xml");
+    declare @type: TrainingProgramIntegrationTest: @ContextConfiguration(locations = "classpath*:/META-INF/spring/applicationContext*.xml");
 
     declare @type: TrainingProgramIntegrationTest: @Transactional;
 
@@ -101,7 +104,16 @@ privileged aspect TrainingProgramIntegrationTest_Roo_IntegrationTest {
         TrainingProgram obj = dod.getNewTransientTrainingProgram(Integer.MAX_VALUE);
         Assert.assertNotNull("Data on demand for 'TrainingProgram' failed to provide a new transient entity", obj);
         Assert.assertNull("Expected 'TrainingProgram' identifier to be null", obj.getId());
-        obj.persist();
+        try {
+            obj.persist();
+        } catch (final ConstraintViolationException e) {
+            final StringBuilder msg = new StringBuilder();
+            for (Iterator<ConstraintViolation<?>> iter = e.getConstraintViolations().iterator(); iter.hasNext();) {
+                final ConstraintViolation<?> cv = iter.next();
+                msg.append("[").append(cv.getRootBean().getClass().getName()).append(".").append(cv.getPropertyPath()).append(": ").append(cv.getMessage()).append(" (invalid value = ").append(cv.getInvalidValue()).append(")").append("]");
+            }
+            throw new IllegalStateException(msg.toString(), e);
+        }
         obj.flush();
         Assert.assertNotNull("Expected 'TrainingProgram' identifier to no longer be null", obj.getId());
     }