#3358: Illegal command translates to , which is in line with HTTP/1.1…

… spec. Code cleanup
IQSS · Sep 15, 2016 · d813105 · d813105
1 parent 3a753ca
commit d813105
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java b/src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java
@@ -424,7 +424,11 @@ protected Response badApiKey( String apiKey ) {
     }
 
     protected Response permissionError( PermissionException pe ) {
-        return errorResponse( Status.UNAUTHORIZED, pe.getMessage() );
+        return permissionError( pe.getMessage() );
+    }
+
+    protected Response permissionError( String message ) {
+        return errorResponse( Status.UNAUTHORIZED, message );
     }
 
     protected static Response errorResponse( Status sts ) {

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java b/src/main/java/edu/harvard/iq/dataverse/api/Datasets.java
@@ -1,29 +1,23 @@
 package edu.harvard.iq.dataverse.api;
 
 import edu.harvard.iq.dataverse.DOIEZIdServiceBean;
-import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetField;
 import edu.harvard.iq.dataverse.DatasetFieldServiceBean;
 import edu.harvard.iq.dataverse.DatasetFieldType;
-import edu.harvard.iq.dataverse.DatasetFieldValue;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
 import edu.harvard.iq.dataverse.DatasetVersion;
 import edu.harvard.iq.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.DataverseServiceBean;
 import edu.harvard.iq.dataverse.MetadataBlock;
 import edu.harvard.iq.dataverse.MetadataBlockServiceBean;
 import edu.harvard.iq.dataverse.RoleAssignment;
-import edu.harvard.iq.dataverse.api.imports.ImportException;
-import edu.harvard.iq.dataverse.api.imports.ImportUtil;
 import edu.harvard.iq.dataverse.authorization.DataverseRole;
 import edu.harvard.iq.dataverse.authorization.RoleAssignee;
 import edu.harvard.iq.dataverse.authorization.users.User;
 import edu.harvard.iq.dataverse.engine.command.Command;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
-import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.AssignRoleCommand;
-import edu.harvard.iq.dataverse.engine.command.impl.CreateDatasetCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CreateDatasetVersionCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.CreatePrivateUrlCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.DeleteDatasetCommand;
@@ -49,27 +43,19 @@
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.util.json.JsonParseException;
-import edu.harvard.iq.dataverse.util.json.JsonParser;
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.*;
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.StringReader;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
 import javax.json.Json;
 import javax.json.JsonArrayBuilder;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
-import javax.json.JsonReader;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -362,14 +348,11 @@ public Response getVersion( @PathParam("id") String datasetId, @PathParam("versi
     @GET
 	@Path("{id}/versions/{versionId}/files")
     public Response getVersionFiles( @PathParam("id") String datasetId, @PathParam("versionId") String versionId) {
-
         try {
-
             return okResponse( jsonFileMetadatas(
                                             getDatasetVersionOrDie(createDataverseRequest(findUserOrDie()), 
                                                                 versionId, 
                                                                 findDatasetOrDie(datasetId)).getFileMetadatas()));
-
         } catch (WrappedResponse ex) {
             return ex.getResponse();
         }

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java b/src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java
@@ -550,11 +550,9 @@ public Response getGroupByOwnerAndAliasInOwner( @PathParam("identifier") String
                                                     @PathParam("aliasInOwner") String grpAliasInOwner )
     {
         try {
-            ExplicitGroup eg = findExplicitGroupOrDie(findDataverseOrDie(dvIdtf),
+            return okResponse( json(findExplicitGroupOrDie(findDataverseOrDie(dvIdtf),
                                                       createDataverseRequest(findUserOrDie()),
-                                                      grpAliasInOwner);
-
-            return (eg!=null) ? okResponse( json(eg) ) : notFound("Can't find " + grpAliasInOwner + " in dataverse " + dvIdtf);
+                                                      grpAliasInOwner)) );
 
         } catch (WrappedResponse wr) {
             return wr.getResponse();

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Roles.java b/src/main/java/edu/harvard/iq/dataverse/api/Roles.java
@@ -44,8 +44,7 @@ public Response viewRole( @PathParam("id") Long id) {
                 return notFound("role with id " + id + " not found");
             } else  {
                 return ( permissionSvc.userOn(findUserOrDie(), role.getOwner()).has(Permission.ManageDataversePermissions) ) 
-                    ? okResponse( json(role) )
-                        : errorResponse(Status.UNAUTHORIZED, "");
+                    ? okResponse( json(role) ) : permissionError("Permission required to view roles.");
             }
         } catch (WrappedResponse ex) {
             return ex.getResponse();