-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #168 from tsegismont/jira/HWKMETRICS-29
HWKMETRICS-29 Create method return codes should be consistent
- Loading branch information
Showing
9 changed files
with
431 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
...metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/ReaderExceptionMapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Copyright 2014-2015 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.hawkular.metrics.api.jaxrs; | ||
|
|
||
| import javax.ws.rs.core.MediaType; | ||
| import javax.ws.rs.core.Response; | ||
| import javax.ws.rs.ext.ExceptionMapper; | ||
| import javax.ws.rs.ext.Provider; | ||
|
|
||
| import org.jboss.resteasy.spi.ReaderException; | ||
|
|
||
| import com.google.common.base.Throwables; | ||
|
|
||
| /** | ||
| * Exception mapper for any exception thrown by a body reader chain. | ||
| * <p> | ||
| * This mapper let us reply to the user with a pre-determined message format if, for example, a JSON entity cannot be | ||
| * parsed. | ||
| * | ||
| * @author Thomas Segismont | ||
| */ | ||
| @Provider | ||
| public class ReaderExceptionMapper implements ExceptionMapper<ReaderException> { | ||
|
|
||
| @Override | ||
| public Response toResponse(ReaderException exception) { | ||
| return Response.status(Response.Status.BAD_REQUEST) | ||
| .entity(new ApiError(Throwables.getRootCause(exception).getMessage())) | ||
| .type(MediaType.APPLICATION_JSON) | ||
| .build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
...pi-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/callback/EntityCreatedCallback.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright 2014-2015 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.hawkular.metrics.api.jaxrs.callback; | ||
|
|
||
| import java.net.URI; | ||
| import java.util.function.Function; | ||
|
|
||
| import javax.ws.rs.container.AsyncResponse; | ||
| import javax.ws.rs.core.Response; | ||
|
|
||
| import org.hawkular.metrics.api.jaxrs.ApiError; | ||
|
|
||
| import com.google.common.base.Throwables; | ||
| import com.google.common.util.concurrent.FutureCallback; | ||
|
|
||
| /** | ||
| * Base callback class used to build a JAX-RS response when creating an entity (metric, tenant, ...). | ||
| * <p> | ||
| * On success, a <em>201 CREATED</em> response is built with the <em>location</em> header to indicate the URI of the new | ||
| * resource. | ||
| * <p> | ||
| * On failure, a <em>409 CONFLICT</em> response is built if the exception indicates the resource already exists, | ||
| * otherwise a <em>500 SERVER ERROR</em> reponse is built. | ||
| * | ||
| * @author Thomas Segismont | ||
| */ | ||
| public abstract class EntityCreatedCallback<E> implements FutureCallback<Void> { | ||
| private final AsyncResponse asyncResponse; | ||
| private final URI location; | ||
| private final Class<E> alreadyExistsException; | ||
| private final Function<E, Response> alreadyExistsResponseBuilder; | ||
|
|
||
| /** | ||
| * @param asyncResponse JAX-RS asynchronous response reference | ||
| * @param location URI of the new resource if it is successfully created | ||
| * @param alreadyExistsExceptionType type of the exception indicating the resource already exists | ||
| * @param alreadyExistsResponseBuilder a function to build a resource already exists response | ||
| */ | ||
| public EntityCreatedCallback( | ||
| AsyncResponse asyncResponse, | ||
| URI location, | ||
| Class<E> alreadyExistsExceptionType, | ||
| Function<E, Response> alreadyExistsResponseBuilder | ||
| ) { | ||
| this.asyncResponse = asyncResponse; | ||
| this.location = location; | ||
| this.alreadyExistsException = alreadyExistsExceptionType; | ||
| this.alreadyExistsResponseBuilder = alreadyExistsResponseBuilder; | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public void onSuccess(Void result) { | ||
| asyncResponse.resume(Response.created(location).build()); | ||
| } | ||
|
|
||
| @Override | ||
| public void onFailure(Throwable t) { | ||
| Response response; | ||
| if (alreadyExistsException.isAssignableFrom(t.getClass())) { | ||
| response = alreadyExistsResponseBuilder.apply(alreadyExistsException.cast(t)); | ||
| } else { | ||
| String message = "Failed to create tenant due to an unexpected error: " | ||
| + Throwables.getRootCause(t).getMessage(); | ||
| response = Response.serverError().entity(new ApiError(message)).build(); | ||
|
|
||
| } | ||
| asyncResponse.resume(response); | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
...pi-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/callback/MetricCreatedCallback.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Copyright 2014-2015 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.hawkular.metrics.api.jaxrs.callback; | ||
|
|
||
| import java.net.URI; | ||
| import java.util.function.Function; | ||
|
|
||
| import javax.ws.rs.container.AsyncResponse; | ||
| import javax.ws.rs.core.Response; | ||
|
|
||
| import org.hawkular.metrics.core.api.MetricAlreadyExistsException; | ||
|
|
||
| /** | ||
| * An implementation of {@code EntityCreatedCallback} for metric entities. | ||
| * | ||
| * @author Thomas Segismont | ||
| */ | ||
| public class MetricCreatedCallback extends EntityCreatedCallback<MetricAlreadyExistsException> { | ||
|
|
||
| public MetricCreatedCallback( | ||
| AsyncResponse asyncResponse, | ||
| URI location, | ||
| Function<MetricAlreadyExistsException, Response> alreadyExistsResponseBuilder | ||
| ) { | ||
| super(asyncResponse, location, MetricAlreadyExistsException.class, alreadyExistsResponseBuilder); | ||
| } | ||
| } |
Oops, something went wrong.