Fix exception handling and add unhappy path tests for records

- Change from ValueEnforcer to explicit IllegalStateException throws
- Fix missing semicolons in throw statements
- Fix error message in recordComponentVararg()
- Add tests for calling record methods on non-record classes
- Add test for duplicate compact constructor

Author: joelittlejohn

jcodemodel/src/main/java/com/helger/jcodemodel/JDefinedClass.java

@@ -377,7 +377,8 @@ public boolean containsEnumConstant (@NonNull final String sName)
   @NonNull
   public JRecordComponent recordComponent (@NonNull final AbstractJType aType, @NonNull final String sName)
   {
-    ValueEnforcer.isTrue (isRecord (), "recordComponent() is only valid for record types");
+    if (!isRecord())
+      throw new IllegalStateException("recordComponent() is only valid for record types");
     ValueEnforcer.notNull (aType, "Type");
     ValueEnforcer.notNull (sName, "Name");
 
@@ -419,7 +420,8 @@ public JRecordComponent recordComponent (@NonNull final Class <?> aType, @NonNul
   @NonNull
   public JRecordComponent recordComponentVararg (@NonNull final AbstractJType aType, @NonNull final String sName)
   {
-    ValueEnforcer.isTrue (isRecord (), "recordComponentVararg() is only valid for record types");
+    if (!isRecord())
+      throw new IllegalStateException("recordComponentVararg() is only valid for record types");
     ValueEnforcer.notNull (aType, "Type");
     ValueEnforcer.notNull (sName, "Name");
 
@@ -461,8 +463,11 @@ public List <JRecordComponent> recordComponents ()
   @NonNull
   public JMethod compactConstructor (final int nMods)
   {
-    ValueEnforcer.isTrue (isRecord (), "compactConstructor() is only valid for record types");
-    ValueEnforcer.isNull (m_aCompactConstructor, "A compact constructor has already been defined");
+    if (!isRecord())
+      throw new IllegalStateException("compactConstructor() is only valid for record types");
+
+    if (m_aCompactConstructor != null)
+      throw new IllegalStateException("A compact constructor has already been defined");
 
     m_aCompactConstructor = new JMethod (nMods, this);
     return m_aCompactConstructor;

jcodemodel/src/test/java/com/helger/jcodemodel/JDefinedClassTest.java

@@ -172,4 +172,5 @@ public void testCallSuper () throws Exception
     CodeModelTestsHelper.parseCodeModel (cm);
     CodeModelTestsHelper.compileCodeModel (cm);
   }
+
 }

jcodemodel/src/test/java/com/helger/jcodemodel/JRecordTest.java

@@ -474,4 +474,35 @@ public void testRecordWithBoundedTypeParameter () throws JCodeModelException
 
     CodeModelTestsHelper.parseCodeModel (cm);
   }
+
+  @Test(expected=IllegalStateException.class)
+  public void testCantAddRecordComponentsToNonRecordClass() throws JCodeModelException {
+    final JCodeModel cm = new JCodeModel ();
+    final JDefinedClass c = cm._package ("org.example")._class ("SomeClass");
+    c.recordComponent (String.class, "foo");
+  }
+
+  @Test(expected=IllegalStateException.class)
+  public void testCantAddCompactConstructorToNonRecordClass() throws JCodeModelException {
+    final JCodeModel cm = new JCodeModel ();
+    final JDefinedClass c = cm._package ("org.example")._class ("SomeClass");
+    c.compactConstructor (0);
+  }
+
+  @Test(expected=IllegalStateException.class)
+  public void testCantAddRecordComponentVarargToNonRecordClass() throws JCodeModelException {
+    final JCodeModel cm = new JCodeModel ();
+    final JDefinedClass c = cm._package ("org.example")._class ("SomeClass");
+    c.recordComponentVararg (cm.INT, "values");
+  }
+
+  @Test(expected=IllegalStateException.class)
+  public void testCantAddDuplicateCompactConstructor() throws JCodeModelException {
+    final JCodeModel cm = new JCodeModel ();
+    final JDefinedClass rec = cm._package ("org.example")._record ("Range");
+    rec.recordComponent (cm.INT, "lo");
+    rec.recordComponent (cm.INT, "hi");
+    rec.compactConstructor (JMod.PUBLIC);
+    rec.compactConstructor (JMod.PUBLIC); // Should throw
+  }
 }