Code cleanup

src/java/org/extendj/ragdoc/JsonBuilder.java

@@ -86,7 +86,7 @@ public class JsonBuilder {
     JsonObject doc = constr.jsonDocObject();
     if (shouldDocument(constr, doc)) {
       JsonObject obj = new JsonObject();
-      obj.add("name", new JsonString(constr.name()));
+      obj.add("name", Json.of(constr.name()));
       JsonArray modifiers = constr.getModifiers().toJson();
       if (!modifiers.isEmpty()) {
         obj.add("mods", modifiers);
@@ -130,7 +130,7 @@ public class JsonBuilder {
     JsonObject doc = method.jsonDocObject();
     if (shouldDocument(method, doc)) {
       JsonObject obj = new JsonObject();
-      obj.add("name", new JsonString(method.name()));
+      obj.add("name", Json.of(method.name()));
       JsonArray modifiers = method.getModifiers().toJson();
       if (!modifiers.isEmpty()) {
         obj.add("mods", modifiers);
@@ -229,7 +229,7 @@ public class JsonBuilder {
     if (shouldDocument(field, doc)) {
       for (Declarator declarator : field.getDeclaratorList()) {
         JsonObject obj = new JsonObject();
-        obj.add("name", new JsonString(declarator.name()));
+        obj.add("name", Json.of(declarator.name()));
         obj.add("type", typeRef(declarator.type()));
         JsonArray modifiers = field.getModifiers().toJson();
         if (!modifiers.isEmpty()) {
@@ -275,25 +275,25 @@ public class JsonBuilder {
                 }
               }
               doc.add("ragFile", Json.of(relativePath));
-              doc.add("line", new JsonString(lineno));
+              doc.add("line", Json.of(lineno));
             }
             break;
           case "aspect":
             aspectName = tag.text;
-            doc.add("aspect", new JsonString(aspectName));
+            doc.add("aspect", Json.of(aspectName));
             break;
           case "param":
             params.add(tag.text);
             break;
           default:
-            doc.add(tag.tag, new JsonString(tag.text));
+            doc.add(tag.tag, Json.of(tag.text));
             break;
         }
       }
       if (!params.isEmpty()) {
         doc.add("params", params);
       }
-      doc.add("description", new JsonString(javadoc));
+      doc.add("description", Json.of(javadoc));
       if (aspectName != null) {
         aspects.add(aspectName);
       }
@@ -316,7 +316,7 @@ public class JsonBuilder {
     for (TypeDecl type : unit.localTypes()) {
       if (JsonBuilder.shouldDocument(type)) {
         JsonObject typeJson = typeJson(type);
-        typeJson.add("id", new JsonString(typeId(type)));
+        typeJson.add("id", Json.of(typeId(type)));
         TypeDecl enclosing = type.enclosingType();
         if (enclosing != null) {
           typeJson.add("enclosing", typeRef(enclosing));
@@ -330,9 +330,9 @@ public class JsonBuilder {
 
   private JsonObject typeJson(TypeDecl type) {
     JsonObject obj = new JsonObject();
-    obj.add("kind", new JsonString(type.objectKind()));
-    obj.add("name", new JsonString(type.nameWithTypeArgs()));
-    obj.add("pkg", new JsonString(type.packageName()));
+    obj.add("kind", Json.of(type.objectKind()));
+    obj.add("name", Json.of(type.nameWithTypeArgs()));
+    obj.add("pkg", Json.of(type.packageName()));
     if (type instanceof ClassDecl) {
       ClassDecl klass = (ClassDecl) type;
       if (klass.hasSuperclass()) {
@@ -478,7 +478,7 @@ public class JsonBuilder {
     for (String kind : kinds) {
       if (groupMap.containsKey(kind)) {
         JsonObject group = new JsonObject();
-        group.add("kind", new JsonString(kind));
+        group.add("kind", Json.of(kind));
         JsonArray members = groupMap.get(kind);
         sortArrayBy(members, "name");
         group.add("members", members);
@@ -508,7 +508,7 @@ public class JsonBuilder {
       }
 
       JsonObject entry = new JsonObject();
-      entry.add("name", new JsonString(packageName));
+      entry.add("name", Json.of(packageName));
       JsonArray groups = groupify(groupMap, TYPE_KINDS);
       entry.add("groups", groups);
       packageIndex.add(entry);