#526 Removing trailing comma when including parents in toJson() method

Author: Igor Polevoy

activejdbc/src/main/java/org/javalite/activejdbc/Model.java

@@ -790,7 +790,7 @@ public String toString() {
           .append("', attributes: ").append(attributes);
 
         if (cachedParents.size() > 0) {
-            sb.append(", parents: ").append(cachedParents);
+            sb.append(", parent: ").append(cachedParents);
         }
 
         if (cachedChildren.size() > 0) {
@@ -1088,12 +1088,19 @@ private String[] attributeNamesLowerCased() {
      * referential integrity is not enforced in DBMS with a foreign key constraint.
      *
      * @param parentClass   class of a parent model.
-     * @return instance of a parent of this instance in the "belongs to"  relationship.
+     * @return instance of a parent of this instance in the "belongs to"  relationship if found, ot null if not found.
      */
     public <P extends Model> P parent(Class<P> parentClass) {
         return parent(parentClass, false);
     }
 
+    /**
+     * Same as {@link #parent(Class)}, with additional argument.
+     *
+     * @param parentClass class of a parent model
+     * @param cache true to also cache a found instance for future reference.
+     * @return instance of a parent of this instance in the "belongs to"  relationship if found, ot null if not found.
+     */
     public <P extends Model> P parent(Class<P> parentClass, boolean cache) {
         P cachedParent = parentClass.cast(cachedParents.get(parentClass));
         if (cachedParent != null) {

activejdbc/src/test/java/org/javalite/activejdbc/ToJsonSpec.java

@@ -184,7 +184,7 @@ public void shouldKeepParametersCase() {
 
     @Test
     @SuppressWarnings("unchecked")
-    public void shouldIncludeParents() {
+    public void shouldIncludeParent() {
         deleteAndPopulateTables("libraries", "books", "readers");
         List<Book> books = Book.findAll().orderBy(Book.getMetaModel().getIdName()).include(Reader.class, Library.class);
 
@@ -198,5 +198,26 @@ public void shouldIncludeParents() {
         Map library = libraries.get(0);
         a(library.get("address")).shouldBeEqual("124 Pine Street");
     }
-}
 
+
+    @Test @SuppressWarnings("unchecked")
+    public void shouldIncludeParents() {
+
+        deleteFromTable("computers");
+        deleteFromTable("motherboards");
+        deleteFromTable("keyboards");
+
+        populateTable("motherboards");
+        populateTable("keyboards");
+        populateTable("computers");
+
+        String json = Computer.findAll().include(Motherboard.class, Keyboard.class).toJson(true);
+        List list = org.javalite.common.JsonHelper.toList(json);
+        Map m = (Map) list.get(0);
+        Map parents = (Map) m.get("parents");
+        List motherboards = (List) parents.get("motherboards");
+        List keyboards = (List) parents.get("keyboards");
+        the(motherboards.size()).shouldBeEqual(1);
+        the(keyboards.size()).shouldBeEqual(1);
+    }
+}