demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Made swagger visible in the RootResource (/rest) (#1568)

Browse Source 
Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer
2020-07-24 10:23:48 +02:00
committed by GitHub
parent ed21001891
commit e228d490d8
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.io.rest.swagger/src/main/java/org/openhab/core/io/rest/swagger/impl/RESTResource.java → bundles/org.openhab.core.io.rest.swagger/src/main/java/org/openhab/core/io/rest/swagger/impl/SwaggerResource.java
+10 -6
View File
@@ -23,12 +23,14 @@ import javax.ws.rs.core.Response;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.core.io.rest.RESTConstants;
import org.openhab.core.io.rest.RESTResource;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants;
import org.osgi.service.jaxrs.whiteboard.propertytypes.JSONRequired;
import org.osgi.service.jaxrs.whiteboard.propertytypes.JaxrsApplicationSelect;
import org.osgi.service.jaxrs.whiteboard.propertytypes.JaxrsName;
import org.osgi.service.jaxrs.whiteboard.propertytypes.JaxrsResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,19 +38,21 @@ import org.slf4j.LoggerFactory;
import de.maggu2810.jaxrswb.swagger1.gen.JaxRsWhiteboardSwaggerGenerator;
/**
* An endpoint to generate and provide a Swagger 1 description.
* An endpoint to generate and provide a Swagger description.
*
* @author Markus Rathgeb - Initial contribution
* @author Kai Kreuzer - made it a RESTResource to register in the root bean
*/
@Component(service = RESTResource.class)
@Component(service = SwaggerResource.class)
@JaxrsResource
@JaxrsName("spec")
@JaxrsApplicationSelect("(" + JaxrsWhiteboardConstants.JAX_RS_NAME + "=" + RESTConstants.JAX_RS_NAME + ")")
@JSONRequired
@Path("/swagger.json")
@Path("/spec")
@NonNullByDefault
public class RESTResource {
public class SwaggerResource implements RESTResource {
private final Logger logger = LoggerFactory.getLogger(RESTResource.class);
private final Logger logger = LoggerFactory.getLogger(SwaggerResource.class);
private final JaxRsWhiteboardSwaggerGenerator generator;
/**
@@ -57,7 +61,7 @@ public class RESTResource {
* @param generator the generator
*/
@Activate
public RESTResource(final @Reference JaxRsWhiteboardSwaggerGenerator generator) {
public SwaggerResource(final @Reference JaxRsWhiteboardSwaggerGenerator generator) {
this.generator = generator;
}
features/karaf/openhab-core/src/main/feature/feature.xml
+1
View File
@@ -435,6 +435,7 @@
<feature>openhab-core-io-rest-sitemap</feature>
<feature>openhab-core-io-rest-audio</feature>
<feature>openhab-core-io-rest-voice</feature>
<feature>openhab-core-io-rest-swagger</feature>
<feature>openhab-core-io-rest-mdns</feature>
<feature>openhab-core-model-lsp</feature>
<feature>openhab-core-model-item</feature>