Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

present an error message when the annotation is not found

Browse Source
This commit is contained in:
Athou
2013-04-17 10:34:52 +02:00
parent 3ddbeba0eb
commit 5ab2d3739d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/commafeed/frontend/rest/resources/AbstractREST.java
View File

@@ -6,7 +6,6 @@ import javax.annotation.PostConstruct;
import javax.inject.Inject; import javax.inject.Inject;
import javax.interceptor.AroundInvoke; import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext; import javax.interceptor.InvocationContext;
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
@@ -172,17 +171,18 @@ public abstract class AbstractREST {
@GET @GET
@ApiOperation(value = "Returns information about API parameters", responseClass = "com.wordnik.swagger.core.Documentation") @ApiOperation(value = "Returns information about API parameters", responseClass = "com.wordnik.swagger.core.Documentation")
public Response getHelp(@Context ServletConfig sc, public Response getHelp(@Context HttpHeaders headers,
@Context HttpHeaders headers, @Context UriInfo uriInfo) { @Context UriInfo uriInfo) {
TypeUtil.addAllowablePackage(Entries.class.getPackage().getName()); TypeUtil.addAllowablePackage(Entries.class.getPackage().getName());
String apiVersion = ApiListingResource.API_VERSION; String apiVersion = ApiListingResource.API_VERSION;
String swaggerVersion = SwaggerSpec.version(); String swaggerVersion = SwaggerSpec.version();
String basePath = ApiListingResource String basePath = ApiListingResource
.getBasePath(applicationSettingsService.get().getPublicUrl()); .getBasePath(applicationSettingsService.get().getPublicUrl());
Api api = this.getClass().getAnnotation(Api.class); Api api = getClass().getAnnotation(Api.class);
if (api == null) { if (api == null) {
return Response.status(Status.NOT_FOUND).build(); return Response.status(Status.NOT_FOUND)
.entity("Api annotation not found").build();
} }
String apiPath = api.value(); String apiPath = api.value();
String apiListingPath = api.value(); String apiListingPath = api.value();