add author to json response

Signed-off-by: Ross Murphy <RossMurphy@ibm.com>

Author: 2000rosser

src/main/java/org/dependencytrack/model/Component.java

@@ -401,15 +401,17 @@ public String getPublisher() {
     }
 
     @Deprecated
-    @JsonIgnore
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public String getAuthor(){
         return ModelConverter.convertContactsToString(this.authors);
     }
 
     @Deprecated
     public void setAuthor(String author){
-        if(this.authors==null){
+        if (this.authors == null) {
             this.authors = new ArrayList<>();
+        } else {
+            this.authors.clear();
         }
         this.authors.add(new OrganizationalContact() {{
             setName(author);

src/main/java/org/dependencytrack/model/Project.java

@@ -307,7 +307,7 @@ public void setAuthors(List<OrganizationalContact> authors) {
     }
 
     @Deprecated
-    @JsonIgnore
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public String getAuthor(){
         return ModelConverter.convertContactsToString(this.authors);
     }
@@ -316,6 +316,8 @@ public String getAuthor(){
     public void setAuthor(String author){
         if(this.authors==null){
             this.authors = new ArrayList<>();
+        } else{
+            this.authors.clear();
         }
         this.authors.add(new OrganizationalContact() {{
             setName(author);

src/main/java/org/dependencytrack/resources/v1/ComponentResource.java

@@ -285,6 +285,7 @@ public Response createComponent(@Parameter(description = "The UUID of the projec
         final Validator validator = super.getValidator();
         failOnValidationError(
                 validator.validateProperty(jsonComponent, "authors"),
+                validator.validateProperty(jsonComponent, "author"),
                 validator.validateProperty(jsonComponent, "publisher"),
                 validator.validateProperty(jsonComponent, "name"),
                 validator.validateProperty(jsonComponent, "version"),

src/main/java/org/dependencytrack/resources/v1/ProjectResource.java

@@ -289,6 +289,7 @@ public Response getProjectsByClassifier(
     public Response createProject(Project jsonProject) {
         final Validator validator = super.getValidator();
         failOnValidationError(
+                validator.validateProperty(jsonProject, "author"),
                 validator.validateProperty(jsonProject, "authors"),
                 validator.validateProperty(jsonProject, "publisher"),
                 validator.validateProperty(jsonProject, "group"),
@@ -429,6 +430,7 @@ public Response patchProject(
             Project jsonProject) {
         final Validator validator = getValidator();
         failOnValidationError(
+                validator.validateProperty(jsonProject, "author"),
                 validator.validateProperty(jsonProject, "authors"),
                 validator.validateProperty(jsonProject, "publisher"),
                 validator.validateProperty(jsonProject, "group"),

src/test/java/org/dependencytrack/resources/v1/ComponentResourceTest.java

@@ -48,6 +48,7 @@
 import java.util.UUID;
 
 import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
+import static net.javacrumbs.jsonunit.assertj.JsonAssertions.json;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ComponentResourceTest extends ResourceTest {
@@ -515,6 +516,7 @@ public void createComponentTest() {
         Assert.assertNotNull(json);
         Assert.assertEquals("My Component", json.getString("name"));
         Assert.assertEquals("SampleAuthor" ,json.getJsonArray("authors").getJsonObject(0).getString("name"));
+        Assert.assertEquals("SampleAuthor", json.getString("author"));
         Assert.assertEquals("1.0", json.getString("version"));
         Assert.assertTrue(UuidUtil.isValidUUID(json.getString("uuid")));
     }