Skip to content

Commit

Permalink
fixing more * imports in Experiments Resource
Browse files Browse the repository at this point in the history
  • Loading branch information
shoeffner committed Aug 19, 2016
1 parent 34df48f commit be6b204
Showing 1 changed file with 24 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.intuit.wasabi.authenticationobjects.UserInfo;
import com.intuit.wasabi.authenticationobjects.UserInfo.Username;
import com.intuit.wasabi.authorization.Authorization;
import com.intuit.wasabi.authorizationobjects.Permission;
import com.intuit.wasabi.authorizationobjects.UserRole;
import com.intuit.wasabi.events.EventsExport;
import com.intuit.wasabi.exceptions.AuthenticationException;
Expand Down Expand Up @@ -76,8 +77,22 @@
import java.util.Set;
import java.util.TimeZone;

import static com.intuit.wasabi.api.APISwaggerResource.*;
import static com.intuit.wasabi.authorizationobjects.Permission.*;
import static com.intuit.wasabi.api.APISwaggerResource.DEFAULT_FILTER;
import static com.intuit.wasabi.api.APISwaggerResource.DEFAULT_MODBUCK;
import static com.intuit.wasabi.api.APISwaggerResource.DEFAULT_PAGE;
import static com.intuit.wasabi.api.APISwaggerResource.DEFAULT_PER_PAGE;
import static com.intuit.wasabi.api.APISwaggerResource.DEFAULT_PUTBUCK;
import static com.intuit.wasabi.api.APISwaggerResource.DEFAULT_SORT;
import static com.intuit.wasabi.api.APISwaggerResource.DEFAULT_TIMEZONE;
import static com.intuit.wasabi.api.APISwaggerResource.DOC_FILTER;
import static com.intuit.wasabi.api.APISwaggerResource.DOC_PAGE;
import static com.intuit.wasabi.api.APISwaggerResource.DOC_PER_PAGE;
import static com.intuit.wasabi.api.APISwaggerResource.DOC_SORT;
import static com.intuit.wasabi.api.APISwaggerResource.DOC_TIMEZONE;
import static com.intuit.wasabi.api.APISwaggerResource.EXAMPLE_AUTHORIZATION_HEADER;
import static com.intuit.wasabi.authorizationobjects.Permission.CREATE;
import static com.intuit.wasabi.authorizationobjects.Permission.READ;
import static com.intuit.wasabi.authorizationobjects.Permission.UPDATE;
import static com.intuit.wasabi.authorizationobjects.Role.ADMIN;
import static com.intuit.wasabi.authorizationobjects.UserRole.newInstance;
import static com.intuit.wasabi.experimentobjects.Experiment.State.DELETED;
Expand All @@ -86,7 +101,9 @@
import static java.lang.Boolean.FALSE;
import static java.util.TimeZone.getTimeZone;
import static javax.ws.rs.core.HttpHeaders.AUTHORIZATION;
import static javax.ws.rs.core.MediaType.*;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
import static javax.ws.rs.core.Response.Status.CREATED;
import static javax.ws.rs.core.Response.Status.NO_CONTENT;
import static org.apache.commons.lang3.StringUtils.isBlank;
Expand Down Expand Up @@ -399,7 +416,7 @@ public Response deleteExperiment(@PathParam("experimentID")
throw new ExperimentNotFoundException(experimentID);
}

authorization.checkUserPermissions(userName, experiment.getApplicationName(), DELETE);
authorization.checkUserPermissions(userName, experiment.getApplicationName(), Permission.DELETE);

// Note: deleting an experiment follows the same rules as
// updating its state to "deleted" -- so reuse the code.
Expand Down Expand Up @@ -716,7 +733,7 @@ public Response deleteBucket(@PathParam("experimentID")
throw new ExperimentNotFoundException(experimentID);
}

authorization.checkUserPermissions(userName, experiment.getApplicationName(), DELETE);
authorization.checkUserPermissions(userName, experiment.getApplicationName(), Permission.DELETE);

UserInfo user = authorization.getUserInfo(userName);

Expand Down Expand Up @@ -889,7 +906,7 @@ public Response removeExclusions(@PathParam("experimentID_1")
throw new ExperimentNotFoundException(experimentID_1);
}

authorization.checkUserPermissions(userName, experiment.getApplicationName(), DELETE);
authorization.checkUserPermissions(userName, experiment.getApplicationName(), Permission.DELETE);
//this is the user that triggered the event and will be used for logging
mutex.deleteExclusion(experimentID_1, experimentID_2, authorization.getUserInfo(userName));

Expand Down Expand Up @@ -1186,7 +1203,7 @@ public Response deletePage(@PathParam("experimentID")
throw new ExperimentNotFoundException(experimentID);
}

authorization.checkUserPermissions(userName, experiment.getApplicationName(), DELETE);
authorization.checkUserPermissions(userName, experiment.getApplicationName(), Permission.DELETE);
pages.deletePage(experimentID, pageName, authorization.getUserInfo(userName));

return httpHeader.headers(NO_CONTENT).build();
Expand Down

0 comments on commit be6b204

Please sign in to comment.