Mercurial > hg > thermostat-ng > web-gateway

changeset 19:767131c1be24 swagger

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes to run as OSGi bundle (not fully complete)
author Jie Kang <jkang@redhat.com>
date Tue, 21 Feb 2017 16:07:41 -0500
parents 8e191b901dde
children b6fbbf79ed67
files server/command/src/main/java/com/redhat/thermostat/server/command/WebEndpointCommand.java server/core/pom.xml server/core/src/main/java/com/redhat/thermostat/server/core/SwaggerServer.java server/core/src/main/java/io/swagger/api/impl/DefaultApiServiceImpl.java server/distribution/pom.xml
diffstat 5 files changed, 34 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/server/command/src/main/java/com/redhat/thermostat/server/command/WebEndpointCommand.java	Tue Feb 21 15:29:25 2017 -0500
+++ b/server/command/src/main/java/com/redhat/thermostat/server/command/WebEndpointCommand.java	Tue Feb 21 16:07:41 2017 -0500
@@ -50,7 +50,7 @@
 import com.redhat.thermostat.common.cli.CommandContext;
 import com.redhat.thermostat.common.cli.CommandException;
 import com.redhat.thermostat.common.config.experimental.ConfigurationInfoSource;
-import com.redhat.thermostat.server.core.CoreServer;
+import com.redhat.thermostat.server.core.SwaggerServer;
 
 @Component
 @Service(Command.class)
@@ -58,7 +58,7 @@
 public class WebEndpointCommand extends AbstractCommand {
 
     @Reference
-    private CoreServer coreServer;
+    private SwaggerServer coreServer;
 
     @Reference
     private ConfigurationInfoSource config;
--- a/server/core/pom.xml	Tue Feb 21 15:29:25 2017 -0500
+++ b/server/core/pom.xml	Tue Feb 21 16:07:41 2017 -0500
@@ -68,6 +68,8 @@
                             com.redhat.thermostat.server.core,
                         </Export-Package>
                         <Private-Package>
+                            io.swagger.api.*,
+                            io.swagger.model.*,
                             com.redhat.thermostat.server.core.internal.*,
                         </Private-Package>
                         <_nouses>true</_nouses>
--- a/server/core/src/main/java/com/redhat/thermostat/server/core/SwaggerServer.java	Tue Feb 21 15:29:25 2017 -0500
+++ b/server/core/src/main/java/com/redhat/thermostat/server/core/SwaggerServer.java	Tue Feb 21 16:07:41 2017 -0500
@@ -10,6 +10,8 @@
 
 import javax.servlet.DispatcherType;
 
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
@@ -34,6 +36,8 @@
 import io.swagger.api.Bootstrap;
 import io.swagger.jersey.config.JerseyJaxrsConfig;
 
+@Component
+@Service(SwaggerServer.class)
 public class SwaggerServer {
 
     Server server;
--- a/server/core/src/main/java/io/swagger/api/impl/DefaultApiServiceImpl.java	Tue Feb 21 15:29:25 2017 -0500
+++ b/server/core/src/main/java/io/swagger/api/impl/DefaultApiServiceImpl.java	Tue Feb 21 16:07:41 2017 -0500
@@ -1,25 +1,18 @@
 package io.swagger.api.impl;
 
-import io.swagger.api.*;
-import io.swagger.model.*;
-
-import io.swagger.model.Namespaces;
-
-import java.util.List;
+import io.swagger.api.ApiResponseMessage;
+import io.swagger.api.DefaultApiService;
 import io.swagger.api.NotFoundException;
 
-import java.io.InputStream;
-
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
 
 @javax.annotation.Generated(value = "io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2017-02-21T16:01:56.111Z")
 public class DefaultApiServiceImpl extends DefaultApiService {
+
     @Override
     public Response rootGet(SecurityContext securityContext) throws NotFoundException {
-        // do some magic!
+
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
 }
--- a/server/distribution/pom.xml	Tue Feb 21 15:29:25 2017 -0500
+++ b/server/distribution/pom.xml	Tue Feb 21 16:07:41 2017 -0500
@@ -191,28 +191,28 @@
             <scope>compile</scope>
             <version>${swagger-core-version}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>${servlet-api-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>${logback-version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>${logback-version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.brsanthu</groupId>
-            <artifactId>migbase64</artifactId>
-            <version>2.2</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>javax.servlet</groupId>-->
+            <!--<artifactId>servlet-api</artifactId>-->
+            <!--<version>${servlet-api-version}</version>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>ch.qos.logback</groupId>-->
+            <!--<artifactId>logback-classic</artifactId>-->
+            <!--<version>${logback-version}</version>-->
+            <!--<scope>compile</scope>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>ch.qos.logback</groupId>-->
+            <!--<artifactId>logback-core</artifactId>-->
+            <!--<version>${logback-version}</version>-->
+            <!--<scope>compile</scope>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.brsanthu</groupId>-->
+            <!--<artifactId>migbase64</artifactId>-->
+            <!--<version>2.2</version>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.hamcrest</groupId>