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

use application resources to find the annotation, as weld is proxying classes and annotation is not present on those

Browse Source
This commit is contained in:
Athou
2013-04-17 11:38:55 +02:00
parent ff5d77adaf
commit ebd8d8afb8
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Application;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
@@ -19,6 +20,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriInfo;
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.ThreadContext;
import org.apache.wicket.authentication.IAuthenticationStrategy;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
@@ -171,15 +173,26 @@ public abstract class AbstractREST {
@GET
@ApiOperation(value = "Returns information about API parameters", responseClass = "com.wordnik.swagger.core.Documentation")
public Response getHelp(@Context HttpHeaders headers,
@Context UriInfo uriInfo) {
public Response getHelp(@Context Application app,
@Context HttpHeaders headers, @Context UriInfo uriInfo) {
TypeUtil.addAllowablePackage(Entries.class.getPackage().getName());
String apiVersion = ApiListingResource.API_VERSION;
String swaggerVersion = SwaggerSpec.version();
String basePath = ApiListingResource
.getBasePath(applicationSettingsService.get().getPublicUrl());
Api api = getClass().getAnnotation(Api.class);
Api api = null;
String path = prependSlash(uriInfo.getPath());
for (Class<?> klass : app.getClasses()) {
Api a = klass.getAnnotation(Api.class);
if (a != null && a.value() != null
&& StringUtils.equals(prependSlash(a.value()), path)) {
api = a;
break;
}
}
if (api == null) {
return Response
.status(Status.NOT_FOUND)
@@ -198,4 +211,11 @@ public abstract class AbstractREST {
doc.setApiVersion(apiVersion);
return Response.ok().entity(doc).build();
}
private String prependSlash(String path) {
if (!path.startsWith("/")) {
path = "/" + path;
}
return path;
}
}