Skip to content
Snippets Groups Projects
Commit 1ccedaee authored by Martin Weise's avatar Martin Weise
Browse files

swagger running on both services

parent 72921acd
No related branches found
No related tags found
No related merge requests found
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<groupId>at.tuwien</groupId> <groupId>at.tuwien</groupId>
<artifactId>api</artifactId> <artifactId>api</artifactId>
<version>${global.version}</version> <version>${global.version}</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -5,17 +5,12 @@ import at.tuwien.model.Database; ...@@ -5,17 +5,12 @@ import at.tuwien.model.Database;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.reactive.function.client.ClientResponse; import org.springframework.web.reactive.function.client.ClientResponse;
import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import javax.ws.rs.core.Response;
import java.util.Collections;
import java.util.List; import java.util.List;
@Component @Component
......
...@@ -18,11 +18,7 @@ ...@@ -18,11 +18,7 @@
<groupId>at.tuwien</groupId> <groupId>at.tuwien</groupId>
<artifactId>services</artifactId> <artifactId>services</artifactId>
<version>${global.version}</version> <version>${global.version}</version>
</dependency> <scope>compile</scope>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>api</artifactId>
<version>${global.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -4,17 +4,13 @@ import at.tuwien.dto.CreateDatabaseDTO; ...@@ -4,17 +4,13 @@ import at.tuwien.dto.CreateDatabaseDTO;
import at.tuwien.model.Database; import at.tuwien.model.Database;
import at.tuwien.service.DatabaseService; import at.tuwien.service.DatabaseService;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.reactive.function.client.ClientResponse;
import javax.ws.rs.core.MediaType; import java.util.List;
import javax.ws.rs.core.Response;
@RestController @RestController
@RequestMapping("/database") @RequestMapping("/database")
...@@ -44,6 +40,7 @@ public class DatabaseController { ...@@ -44,6 +40,7 @@ public class DatabaseController {
// .status(Response.Status.INTERNAL_SERVER_ERROR) // .status(Response.Status.INTERNAL_SERVER_ERROR)
// .type(MediaType.APPLICATION_JSON) // .type(MediaType.APPLICATION_JSON)
// .build(); // .build();
return null;
} }
...@@ -51,6 +48,7 @@ public class DatabaseController { ...@@ -51,6 +48,7 @@ public class DatabaseController {
public List<Database> listDatabases() { public List<Database> listDatabases() {
// LOGGER.debug("getting a list of created databases"); // LOGGER.debug("getting a list of created databases");
// return service.findAllCreatedDatabases(); // return service.findAllCreatedDatabases();
return null;
} }
......
...@@ -16,13 +16,15 @@ ...@@ -16,13 +16,15 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>at.tuwien</groupId> <groupId>at.tuwien</groupId>
<artifactId>api</artifactId> <artifactId>gateways</artifactId>
<version>${global.version}</version> <version>${global.version}</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>at.tuwien</groupId> <groupId>at.tuwien</groupId>
<artifactId>gateways</artifactId> <artifactId>api</artifactId>
<version>${global.version}</version> <version>${global.version}</version>
<scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
package at.tuwien.service; package at.tuwien.service;
import at.tuwien.clients.FdaContainerManagingClient; import at.tuwien.clients.FdaContainerManagingClient;
import at.tuwien.dto.CreateDatabaseDTO; import at.tuwien.dto.CreateDatabaseDTO;
import at.tuwien.model.Database; import at.tuwien.model.Database;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment