Merge pull request #67 from JingMa87/DD-424-post-wrong-json

DD-424 post wrong json

Author: PaulBoon

src/main/java/edu/harvard/iq/dataverse/License.java

@@ -126,12 +126,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         License license = (License) o;
-        return active == license.active &&
-                Objects.equals(id, license.id) &&
-                Objects.equals(name, license.name) &&
-                Objects.equals(shortDescription, license.shortDescription) &&
-                Objects.equals(uri, license.uri) &&
-                Objects.equals(iconUrl, license.iconUrl);
+        return active == license.active && id.equals(license.id) && name.equals(license.name) && shortDescription.equals(license.shortDescription) && uri.equals(license.uri) && iconUrl.equals(license.iconUrl);
     }
 
     @Override

src/main/java/edu/harvard/iq/dataverse/api/Admin.java

@@ -46,10 +46,10 @@
 import edu.harvard.iq.dataverse.engine.command.impl.PublishDataverseCommand;
 import edu.harvard.iq.dataverse.settings.Setting;
 import edu.harvard.iq.dataverse.util.json.JsonPrinter;
+import java.net.URI;
 import javax.json.Json;
 import javax.json.JsonArrayBuilder;
 import javax.json.JsonObjectBuilder;
-import javax.persistence.PersistenceException;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -2013,15 +2013,21 @@ public Response getLicenseByName(@PathParam("name") String name) {
 
     @POST
     @Path("/licenses")
-    public Response addLicense(License license) {
+    public Response addLicense(JsonObject jsonObject) {
         try {
+            License license = new License();
+            license.setName(jsonObject.getString("name"));
+            license.setShortDescription(jsonObject.getString("shortDescription"));
+            license.setUri(new URI(jsonObject.getString("uri")));
+            license.setIconUrl(new URI(jsonObject.getString("iconUrl")));
+            license.setActive(jsonObject.getBoolean("active"));
             licenseService.save(license);
 			String location = "/api/admin/licenses/name/" + UrlEscapers.urlFragmentEscaper().escape(license.getName());
 			return created(location, Json.createObjectBuilder().add("message", "License created"));
         } catch (RequestBodyException e) {
-			return error(Response.Status.BAD_REQUEST, e.getMessage());
-		} catch(PersistenceException e) {
-            return error(Response.Status.CONFLICT, "A license with the same URI or name is already present.");
+            return error(Response.Status.BAD_REQUEST, e.getMessage());
+        } catch (Exception e) {
+            return error(Response.Status.BAD_REQUEST, "Something went wrong.");
         }
 	}